Get rid of yyrhs and yyprhs in larl1.java.

	* data/lalr1.java (yyrhs_, yyprhs_): Remove.
	(yy_reduce_print): Rather, use yystos_ and the state stack.

diff --git a/ChangeLog b/ChangeLog
index 06abb17cdcfd816363dfa6fe34339519d1fa6cc1..4485a14548f02714a85afa8972be492c885cee8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-25  Akim Demaille  <demaille@gostai.com>
+
+       Get rid of yyrhs and yyprhs in larl1.java.
+       * data/lalr1.java (yyrhs_, yyprhs_): Remove.
+       (yy_reduce_print): Rather, use yystos_ and the state stack.
+
 2008-11-25  Akim Demaille  <demaille@gostai.com>
 
        Formatting changes.

diff --git a/data/lalr1.java b/data/lalr1.java
index 78953947a61d193637f9e893a550231539686fe2..3d17e46192892107633f31858b395fd67a284b22 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -802,13 +802,6 @@ m4_popdef([b4_at_dollar])])dnl
      First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
   ]b4_typed_parser_table([String], [yytname_], [b4_tname])[
 
-  /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-  ]b4_integral_parser_table([yyrhs_], [b4_rhs])[
-
-  /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-     YYRHS.  */
-  ]b4_integral_parser_table([yyprhs_], [b4_prhs])[
-
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
   ]b4_integral_parser_table([yyrline_], [b4_rline])[
 
@@ -827,7 +820,7 @@ m4_popdef([b4_at_dollar])])dnl
     /* The symbols being reduced.  */
     for (int yyi = 0; yyi < yynrhs; yyi++)
       yy_symbol_print ("   $" + (yyi + 1) + " =",
-                       yyrhs_[yyprhs_[yyrule] + yyi],
+                       yystos_[yystack.stateAt(yyi + 1 - yynrhs)],
                        ]b4_rhs_value(yynrhs, yyi + 1)b4_locations_if([,
                        b4_rhs_location(yynrhs, yyi + 1)])[);
   }