Add %after-shift-error-token

yui-knk · Jan 31, 2024 · 540da2d · 540da2d
1 parent fd861b6
commit 540da2d
Show file tree

Hide file tree

Showing 8 changed files with 495 additions and 457 deletions.
diff --git a/lib/lrama/grammar.rb b/lib/lrama/grammar.rb
@@ -22,7 +22,7 @@ class Grammar
     attr_accessor :union, :expect,
                   :printers, :error_tokens,
                   :lex_param, :parse_param, :initial_action,
-                  :after_shift, :before_reduce, :after_reduce, :after_pop_stack,
+                  :after_shift, :before_reduce, :after_reduce, :after_shift_error_token, :after_pop_stack,
                   :symbols, :types,
                   :rules, :rule_builders,
                   :sym_to_rules, :no_stdlib

diff --git a/lib/lrama/lexer.rb b/lib/lrama/lexer.rb
@@ -28,6 +28,7 @@ class Lexer
       %error-token
       %before-reduce
       %after-reduce
+      %after-shift-error-token
       %after-shift
       %after-pop-stack
       %empty

diff --git a/lib/lrama/output.rb b/lib/lrama/output.rb
@@ -195,6 +195,17 @@ def after_reduce_function(comment = "")
       STR
     end
 
+    def after_shift_error_token_function(comment = "")
+      return "" unless @grammar.after_shift_error_token
+
+      <<-STR
+        #{comment}
+#line #{@grammar.after_shift_error_token.line} "#{@grammar_file_path}"
+        {#{@grammar.after_shift_error_token.s_value}(#{parse_param_name});}
+#line [@oline@] [@ofile@]
+      STR
+    end
+
     def after_pop_stack_function(len, comment = "")
       return "" unless @grammar.after_pop_stack
 

diff --git a/lib/lrama/parser.rb b/lib/lrama/parser.rb
diff --git a/parser.y b/parser.y
@@ -141,6 +141,10 @@ rule
                          {
                            @grammar.after_reduce = val[1]
                          }
+                     | "%after-shift-error-token" IDENTIFIER
+                         {
+                           @grammar.after_shift_error_token = val[1]
+                         }
                      | "%after-pop-stack" IDENTIFIER
                          {
                            @grammar.after_pop_stack = val[1]

diff --git a/spec/fixtures/integration/after_shift.y b/spec/fixtures/integration/after_shift.y
@@ -24,6 +24,12 @@ after_reduce(int len)
     printf("after-reduce: %d, %d\n", __LINE__, len);
 }
 
+static void
+after_shift_error_token(void)
+{
+    printf("after-shift-error-token: %d\n", __LINE__);
+}
+
 static void
 after_pop_stack(int len)
 {
@@ -39,6 +45,7 @@ after_pop_stack(int len)
 %after-shift after_shift
 %before-reduce before_reduce
 %after-reduce after_reduce
+%after-shift-error-token after_shift_error_token
 %after-pop-stack after_pop_stack
 
 %token <val> NUM

diff --git a/spec/lrama/integration_spec.rb b/spec/lrama/integration_spec.rb
@@ -181,16 +181,19 @@ def generate_object(grammar_file_path, c_path, obj_path, command_args: [])
         before-reduce: 18, 1
         after-reduce: 24, 1
         after-shift: 12
-        after-pop-stack: 30, 1
-        after-pop-stack: 30, 1
+        after-pop-stack: 36, 1
+        after-pop-stack: 36, 1
+        after-shift-error-token: 30
         before-reduce: 18, 1
         error (-1)
         after-reduce: 24, 1
-        after-pop-stack: 30, 1
+        after-pop-stack: 36, 1
+        after-shift-error-token: 30
         before-reduce: 18, 1
         error (-1)
         after-reduce: 24, 1
-        after-pop-stack: 30, 1
+        after-pop-stack: 36, 1
+        after-shift-error-token: 30
         before-reduce: 18, 1
         error (-1)
         after-reduce: 24, 1

diff --git a/template/bison/yacc.c b/template/bison/yacc.c
@@ -1988,6 +1988,7 @@ YYLTYPE yylloc = yyloc_default;
 
   /* Shift the error token.  */
   YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp<%= output.user_args %>);
+<%= output.after_shift_error_token_function("/* %after-shift-error-token code. */") %>
 
   yystate = yyn;
   goto yynewstate;