Merge pull request #1 from nobu/parser_state

Fix parser state compilation errors

Author: yui-knk

lib/lrama/grammar/parser_state.rb

@@ -45,18 +45,18 @@ def states_functions
           # define YYPUSH_STATE_#{state_name.upcase}(value) \\
             do \\
               { \\
-                if (#{stack_prefix} + #{states_stack_size_name} - 1 <= #{stack_prefix}_p) \\
-                  YYSTATE_STACK_INCREASE (#{stack_prefix}_a, #{stack_prefix}, #{stack_prefix}_p, #{states_stack_size_name}, "#{state_name}"); \\
-                YYDPRINTF ((stderr, "Push %s to #{state_name}\\n", #{state_name_macro} (value))); \\
-                *++#{stack_prefix}_p = value; \\
+                if (#{stack_prefix}_b + #{states_stack_size_name} - 1 <= #{stack_prefix}_p) \\
+                  YYSTATE_STACK_INCREASE (#{stack_prefix}_a, #{stack_prefix}_b, #{stack_prefix}_p, #{states_stack_size_name}, "#{state_name}"); \\
+                YYDPRINTF ((stderr, "Push %s to #{state_name}\\n", #{state_name_macro} (yyparser_state_ ## value))); \\
+                *++#{stack_prefix}_p = yyparser_state_ ## value; \\
               } \\
             while (0)
 
           # define YYPOP_STATE_#{state_name.upcase}() \\
             do \\
               { \\
                 YYDPRINTF ((stderr, "Pop #{state_name}\\n")); \\
-                if (#{stack_prefix}_p != #{stack_prefix}) \\
+                if (#{stack_prefix}_p != #{stack_prefix}_b) \\
                   { \\
                     #{stack_prefix}_p -= 1; \\
                   } \\
@@ -70,8 +70,8 @@ def states_functions
           # define YYSET_STATE_#{state_name.upcase}(value) \\
             do \\
               { \\
-                YYDPRINTF ((stderr, "Set %s to #{state_name}\\n", #{state_name_macro} (value))); \\
-                *#{stack_prefix}_p = value; \\
+                YYDPRINTF ((stderr, "Set %s to #{state_name}\\n", #{state_name_macro} (yyparser_state_ ## value))); \\
+                *#{stack_prefix}_p = yyparser_state_ ## value; \\
               } \\
             while (0)
 
@@ -81,8 +81,8 @@ def states_functions
 
       def states_clean_up_stack
         <<~CODE
-          if (#{stack_prefix} != #{stack_prefix}_a)
-            YYSTACK_FREE (#{stack_prefix});
+          if (#{stack_prefix}_b != #{stack_prefix}_a)
+            YYSTACK_FREE (#{stack_prefix}_b);
         CODE
       end
 
@@ -97,8 +97,8 @@ def states_stacks
 
           /* The parser state stack (#{stack_prefix}): array, bottom, top.  */
           int #{stack_prefix}_a[YYINITDEPTH];
-          int *#{stack_prefix} = #{stack_prefix}_a;
-          int *#{stack_prefix}_p = #{stack_prefix};
+          int *#{stack_prefix}_b = #{stack_prefix}_a;
+          int *#{stack_prefix}_p = #{stack_prefix}_b;
         STACKS
       end
 

spec/lrama/grammar/parser_state_spec.rb

@@ -58,18 +58,18 @@
         # define YYPUSH_STATE_IN_RESCUE(value) \\
           do \\
             { \\
-              if (yyparser_state_in_rescue + yyparser_state_in_rescue_stacksize - 1 <= yyparser_state_in_rescue_p) \\
-                YYSTATE_STACK_INCREASE (yyparser_state_in_rescue_a, yyparser_state_in_rescue, yyparser_state_in_rescue_p, yyparser_state_in_rescue_stacksize, "in_rescue"); \\
-              YYDPRINTF ((stderr, "Push %s to in_rescue\\n", YY_STATE_IN_RESCUE_NAME (value))); \\
-              *++yyparser_state_in_rescue_p = value; \\
+              if (yyparser_state_in_rescue_b + yyparser_state_in_rescue_stacksize - 1 <= yyparser_state_in_rescue_p) \\
+                YYSTATE_STACK_INCREASE (yyparser_state_in_rescue_a, yyparser_state_in_rescue_b, yyparser_state_in_rescue_p, yyparser_state_in_rescue_stacksize, "in_rescue"); \\
+              YYDPRINTF ((stderr, "Push %s to in_rescue\\n", YY_STATE_IN_RESCUE_NAME (yyparser_state_ ## value))); \\
+              *++yyparser_state_in_rescue_p = yyparser_state_ ## value; \\
             } \\
           while (0)
 
         # define YYPOP_STATE_IN_RESCUE() \\
           do \\
             { \\
               YYDPRINTF ((stderr, "Pop in_rescue\\n")); \\
-              if (yyparser_state_in_rescue_p != yyparser_state_in_rescue) \\
+              if (yyparser_state_in_rescue_p != yyparser_state_in_rescue_b) \\
                 { \\
                   yyparser_state_in_rescue_p -= 1; \\
                 } \\
@@ -83,8 +83,8 @@
         # define YYSET_STATE_IN_RESCUE(value) \\
           do \\
             { \\
-              YYDPRINTF ((stderr, "Set %s to in_rescue\\n", YY_STATE_IN_RESCUE_NAME (value))); \\
-              *yyparser_state_in_rescue_p = value; \\
+              YYDPRINTF ((stderr, "Set %s to in_rescue\\n", YY_STATE_IN_RESCUE_NAME (yyparser_state_ ## value))); \\
+              *yyparser_state_in_rescue_p = yyparser_state_ ## value; \\
             } \\
           while (0)
 
@@ -96,8 +96,8 @@
   describe "#states_clean_up_stack" do
     it "returns states clean up codes" do
       expect(parser_state.states_clean_up_stack).to eq <<~CODE
-        if (yyparser_state_in_rescue != yyparser_state_in_rescue_a)
-          YYSTACK_FREE (yyparser_state_in_rescue);
+        if (yyparser_state_in_rescue_b != yyparser_state_in_rescue_a)
+          YYSTACK_FREE (yyparser_state_in_rescue_b);
       CODE
     end
   end
@@ -116,8 +116,8 @@
 
         /* The parser state stack (yyparser_state_in_rescue): array, bottom, top.  */
         int yyparser_state_in_rescue_a[YYINITDEPTH];
-        int *yyparser_state_in_rescue = yyparser_state_in_rescue_a;
-        int *yyparser_state_in_rescue_p = yyparser_state_in_rescue;
+        int *yyparser_state_in_rescue_b = yyparser_state_in_rescue_a;
+        int *yyparser_state_in_rescue_p = yyparser_state_in_rescue_b;
       STACKS
     end
   end