* src/LR0.c, src/conflicts.c, src/lalr.c, src/lalr.h, src/output.c

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index c1cbb097fafb4a50e52fd4d3b025dc10aba08fc5..d76bd6feea7a6a71c7b7642d781026e9b95d1048 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -52,8 +52,6 @@ typedef struct symbol_list
 } symbol_list;
 
 int lineno;
-char **tags;
-short *user_toknums;
 static symbol_list *grammar;
 static int start_flag;
 static bucket *startval;
@@ -1549,7 +1547,7 @@ token_translations_init (void)
       /* A token which translation has already been set? */
       if (token_translations[bp->user_token_number] != 2)
        complain (_("tokens %s and %s both assigned number %d"),
-                 tags[token_translations[bp->user_token_number]],
+                 symbols[token_translations[bp->user_token_number]]->tag,
                  bp->tag, bp->user_token_number);
       token_translations[bp->user_token_number] = bp->value;
     }
@@ -1568,12 +1566,8 @@ packsymbols (void)
   int tokno = 1;
   int last_user_token_number;
 
-  tags = XCALLOC (char *, nsyms + 1);
-  user_toknums = XCALLOC (short, nsyms + 1);
   symbols = XCALLOC (bucket *, nsyms);
 
-  sassoc = XCALLOC (short, nsyms);
-
   max_user_token_number = 256;
   last_user_token_number = 256;
 
@@ -1644,9 +1638,6 @@ packsymbols (void)
        }
 
       symbols[bp->value] = bp;
-      tags[bp->value] = bp->tag;
-      user_toknums[bp->value] = bp->user_token_number;
-      sassoc[bp->value] = bp->assoc;
     }
 
   token_translations_init ();
@@ -1729,7 +1720,7 @@ packgram (void)
     fatal (_("too many items (max %d)"), MAXSHORT);
 
   ritem = XCALLOC (short, nitems + 1);
-  rule_table = XCALLOC (rule_t, nrules) - 1;
+  rules = XCALLOC (rule_t, nrules) - 1;
 
   itemno = 0;
   ruleno = 1;
@@ -1738,14 +1729,14 @@ packgram (void)
   while (p)
     {
       bucket *ruleprec = p->ruleprec;
-      rule_table[ruleno].lhs = p->sym->value;
-      rule_table[ruleno].rhs = itemno;
-      rule_table[ruleno].line = p->line;
-      rule_table[ruleno].useful = TRUE;
-      rule_table[ruleno].action = p->action;
-      rule_table[ruleno].action_line = p->action_line;
-      rule_table[ruleno].guard = p->guard;
-      rule_table[ruleno].guard_line = p->guard_line;
+      rules[ruleno].lhs = p->sym->value;
+      rules[ruleno].rhs = itemno;
+      rules[ruleno].line = p->line;
+      rules[ruleno].useful = TRUE;
+      rules[ruleno].action = p->action;
+      rules[ruleno].action_line = p->action_line;
+      rules[ruleno].guard = p->guard;
+      rules[ruleno].guard_line = p->guard_line;
 
       p = p->next;
       while (p && p->sym)
@@ -1755,8 +1746,8 @@ packgram (void)
             of the last token in it.  */
          if (p->sym->class == token_sym)
            {
-             rule_table[ruleno].prec = p->sym->prec;
-             rule_table[ruleno].assoc = p->sym->assoc;
+             rules[ruleno].prec = p->sym->prec;
+             rules[ruleno].assoc = p->sym->assoc;
            }
          if (p)
            p = p->next;
@@ -1766,9 +1757,9 @@ packgram (void)
          the specified symbol's precedence replaces the default.  */
       if (ruleprec)
        {
-         rule_table[ruleno].prec = ruleprec->prec;
-         rule_table[ruleno].assoc = ruleprec->assoc;
-         rule_table[ruleno].precsym = ruleprec->value;
+         rules[ruleno].prec = ruleprec->prec;
+         rules[ruleno].assoc = ruleprec->assoc;
+         rules[ruleno].precsym = ruleprec->value;
        }
 
       ritem[itemno++] = -ruleno;