Regen.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 9db02d8ba5a7f2b21d7bdc32d9ac881a60d6315d..f6f39f5a7a0ce7705f204addd781fd596e536d4a 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  */
@@ -32,12 +33,11 @@ int ntokens;
 int nvars;
 
 short *ritem = NULL;
-rule_t *rule_table = NULL;
-short *rprec = NULL;
-short *rprecsym = NULL;
-short *sprec = NULL;
-short *rassoc = NULL;
-short *sassoc = NULL;
+int nritems;
+
+rule_t *rules = NULL;
+
+struct bucket **symbols = NULL;
 short *token_translations = NULL;
 
 int start_symbol;
@@ -60,11 +60,11 @@ ritem_print (FILE *out)
 {
   int i;
   fputs ("RITEM\n", out);
-  for (i = 0; ritem[i]; ++i)
-    if (ritem[i] > 0)
-      fprintf (out, "  %s", tags[ritem[i]]);
+  for (i = 0; i < nritems; ++i)
+    if (ritem[i] >= 0)
+      fprintf (out, "  %s", symbols[ritem[i]]->tag);
     else
-      fprintf (out, "  (rule %d)\n", -ritem[i]);
+      fprintf (out, "  (rule %d)\n", -ritem[i] - 1);
   fputs ("\n\n", out);
 }
 
@@ -76,14 +76,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++;
       }