* src/gram.h, src/gram.c (symbols): New, similar to state_table

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 219bbee5be2911e0e3198fd75c563a16a370b28a..ffab36d3b606126e8a9c769ed5c3489fb3dd2ddc 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -21,6 +21,7 @@
 
 #include "system.h"
 #include "gram.h"
+#include "symtab.h"
 #include "reader.h"
 
 /* comments for these variables are in gram.h  */
@@ -37,6 +38,8 @@ int nritems;
 rule_t *rule_table = NULL;
 short *rprec = NULL;
 short *rprecsym = NULL;
+
+struct bucket **symbols = NULL;
 short *sprec = NULL;
 short *rassoc = NULL;
 short *sassoc = NULL;
@@ -66,7 +69,7 @@ ritem_print (FILE *out)
     if (ritem[i] >= 0)
       fprintf (out, "  %s", tags[ritem[i]]);
     else
-      fprintf (out, "  (rule %d)\n", -ritem[i]);
+      fprintf (out, "  (rule %d)\n", -ritem[i] - 1);
   fputs ("\n\n", out);
 }
 
@@ -78,14 +81,14 @@ ritem_print (FILE *out)
 size_t
 ritem_longest_rhs (void)
 {
-  short *itemp;
   int length;
   int max;
+  int i;
 
   length = 0;
   max = 0;
-  for (itemp = ritem; *itemp; itemp++)
-    if (*itemp > 0)
+  for (i = 0; i < nritems; ++i)
+    if (ritem[i] >= 0)
       {
        length++;
       }