Regen.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 4ec973c121a74161cae5d598fa2fa66c7165f9ee..f6f39f5a7a0ce7705f204addd781fd596e536d4a 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -21,6 +21,7 @@
 
 #include "system.h"
 #include "gram.h"
 
 #include "system.h"
 #include "gram.h"

+#include "symtab.h"

 #include "reader.h"
 
 /* comments for these variables are in gram.h  */
 #include "reader.h"
 
 /* comments for these variables are in gram.h  */


@@ -34,12 +35,9 @@ int nvars;
 short *ritem = NULL;
 int nritems;
 
 short *ritem = NULL;
 int nritems;
 

-rule_t *rule_table = NULL;
-short *rprec = NULL;
-short *rprecsym = NULL;
-short *sprec = NULL;
-short *rassoc = NULL;
-short *sassoc = NULL;
+rule_t *rules = NULL;
+
+struct bucket **symbols = NULL;

 short *token_translations = NULL;
 
 int start_symbol;
 short *token_translations = NULL;
 
 int start_symbol;


@@ -64,7 +62,7 @@ ritem_print (FILE *out)
   fputs ("RITEM\n", out);
   for (i = 0; i < nritems; ++i)
     if (ritem[i] >= 0)
   fputs ("RITEM\n", out);
   for (i = 0; i < nritems; ++i)
     if (ritem[i] >= 0)

-      fprintf (out, "  %s", tags[ritem[i]]);
+      fprintf (out, "  %s", symbols[ritem[i]]->tag);

     else
       fprintf (out, "  (rule %d)\n", -ritem[i] - 1);
   fputs ("\n\n", out);
     else
       fprintf (out, "  (rule %d)\n", -ritem[i] - 1);
   fputs ("\n\n", out);