Merge pull request ruby#225 from yui-knk/resolve_conflicts

Resolve S/R conflicts
ydah · Nov 13, 2023 · ffc2fb3 · ffc2fb3
2 parents 0c855fe + 395f70e
commit ffc2fb3
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 101 deletions.
diff --git a/lib/lrama/parser.rb b/lib/lrama/parser.rb
diff --git a/parser.y b/parser.y
@@ -1,5 +1,5 @@
 class Lrama::Parser
-  expect 7
+  expect 1
 
   token C_DECLARATION CHARACTER IDENT_COLON IDENTIFIER INTEGER STRING TAG
 
@@ -261,9 +261,9 @@ rule
                                        {
                                          result = [{tag: val[0], tokens: val[1]}]
                                        }
-                                   | token_declarations_for_precedence token_declaration_list_for_precedence
+                                   | token_declarations_for_precedence TAG token_declaration_list_for_precedence
                                        {
-                                         result = val[0].append({tag: nil, tokens: val[1]})
+                                         result = val[0].append({tag: val[1], tokens: val[2]})
                                        }
 
   token_declaration_list_for_precedence: token_declaration_for_precedence { result = [val[0]] }