Merge pull request #128 from junk0612/replace-new-parser-4

Replace NewParser with Parser #4
ruby · Oct 16, 2023 · 0358e87 · 0358e87
2 parents aba9428 + c239880
commit 0358e87
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 31 deletions.
diff --git a/lib/lrama/new_parser.rb b/lib/lrama/new_parser.rb
diff --git a/parser.y b/parser.y
@@ -252,8 +252,8 @@ rule
 
   token_declaration_for_precedence: id
 
-  id: IDENTIFIER
-    | CHARACTER
+  id: IDENTIFIER { raise "Ident after %prec" if @prec_seen }
+    | CHARACTER { raise "Char after %prec" if @prec_seen }
 
   grammar: rules_or_grammar_declaration
          | grammar rules_or_grammar_declaration
@@ -280,7 +280,12 @@ rule
               }
           | rhs_list ";"
 
-  rhs: /* empty */ { result = [] }
+  rhs: /* empty */
+         {
+           result = []
+           @prec_seen = false
+           @code_after_prec = false
+         }
      | rhs symbol named_ref_opt
          {
            token = val[1]
@@ -289,6 +294,10 @@ rule
          }
      | rhs "{"
          {
+           if @prec_seen
+             raise "Multiple User_code after %prec" if @code_after_prec
+             @code_after_prec = true
+           end
            @lexer.status = :c_declaration
            @lexer.end_symbol = '}'
          }
@@ -305,6 +314,10 @@ rule
          }
      | "{"
          {
+           if @prec_seen
+             raise "Multiple User_code after %prec" if @code_after_prec
+             @code_after_prec = true
+           end
            @lexer.status = :c_declaration
            @lexer.end_symbol = '}'
          }
@@ -323,6 +336,7 @@ rule
          {
            sym = @grammar.find_symbol_by_id!(val[2])
            result = val[0].append(sym)
+           @prec_seen = true
          }
 
   named_ref_opt: # empty

diff --git a/spec/lrama/new_parser_spec.rb b/spec/lrama/new_parser_spec.rb
@@ -592,7 +592,7 @@ class : keyword_class tSTRING keyword_end { code 1 }
       ])
     end
 
-    xit "error token" do
+    it "error token" do
       y = header + <<~INPUT
 %%
 
@@ -648,7 +648,7 @@ class : keyword_class tSTRING keyword_end { code 1 }
       ])
     end
 
-    xit "action in the middle of RHS" do
+    it "action in the middle of RHS" do
       y = header + <<~INPUT
 %%
 
@@ -744,7 +744,7 @@ class : keyword_class { code 1 } tSTRING { code 2 } keyword_end { code 3 }
     end
 
     describe "invalid_prec" do
-      xit do
+      it do
         y = header + <<~INPUT
 %%
 
@@ -761,7 +761,7 @@ class : keyword_class tSTRING %prec tPLUS keyword_end { code 1 }
         expect { parser.parse }.to raise_error("Ident after %prec")
       end
 
-      xit do
+      it do
         y = header + <<~INPUT
 %%
 
@@ -778,7 +778,7 @@ class : keyword_class { code 2 } tSTRING %prec "=" '!' keyword_end { code 3 }
         expect { parser.parse }.to raise_error("Char after %prec")
       end
 
-      xit do
+      it do
         y = header + <<~INPUT
 %%