Remove parser::rhs_number_type.

	* data/lalr1-fusion.cc (rhs_number_type): No longer define it.
	(yyrhs_): Use b4_table_define.

diff --git a/ChangeLog b/ChangeLog
index 1d2b590e0a4fabc89552d3cc5e28a9e8096b9852..4a211d21997d3ad5c6c12d6925ba138b2c8be7da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-04  Akim Demaille  <demaille@gostai.com>
+
+       Remove parser::rhs_number_type.
+       * data/lalr1-fusion.cc (rhs_number_type): No longer define it.
+       (yyrhs_): Use b4_table_define.
+
 2008-11-04  Akim Demaille  <demaille@gostai.com>
 
        Fix iteration type.

diff --git a/data/lalr1-fusion.cc b/data/lalr1-fusion.cc
index 7ae8ce843bad73e269f2c913f495912733c1f114..e60ab9e561f8c226b565c891ef91149d76aba418 100644 (file)
--- a/data/lalr1-fusion.cc
+++ b/data/lalr1-fusion.cc
@@ -386,10 +386,8 @@ m4_ifdef([b4_stype],
 #endif
 
 #if YYDEBUG
-    /// A type to store symbol numbers and -1.
-    typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type;
     /// A `-1'-separated list of the rules' RHS.
-    static const rhs_number_type yyrhs_[];
+    static const ]b4_int_type_for([b4_rhs])[ yyrhs_[];
     /// For each rule, the index of the first RHS symbol in \a yyrhs_.
     static const ]b4_int_type_for([b4_prhs])[ yyprhs_[];
     /// For each rule, its source line number.
@@ -1142,11 +1140,7 @@ b4_error_verbose_if([ tok])[)
 
 #if YYDEBUG
   /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-  const ]b4_parser_class_name[::rhs_number_type
-  ]b4_parser_class_name[::yyrhs_[] =
-  {
-  ]b4_rhs[
-  };
+  ]b4_table_define([rhs], [b4_rhs])[;
 
   /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
      YYRHS.  */