* src/gram.c (rprec, rprecsym, rassoc): Remove, unused since long

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index bebbc1539b494ff3ab31b817aa1a9b3d36c029c8..527194e06ea2a3c8f99f0b234c00a65461907680 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,18 +1547,17 @@ 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;
     }
 }
 
 
-/*------------------------------------------------------------------.
-| Assign symbol numbers, and write definition of token names into   |
-| FDEFINES.  Set up vectors TAGS and SPREC of names and precedences |
-| of symbols.                                                       |
-`------------------------------------------------------------------*/
+/*----------------------------------------------------------------.
+| Assign symbol numbers, and write definition of token names into |
+| FDEFINES.  Set up vectors SYMBOL_TABLE, TAGS of symbols.        |
+`----------------------------------------------------------------*/
 
 static void
 packsymbols (void)
@@ -1569,11 +1566,7 @@ packsymbols (void)
   int tokno = 1;
   int last_user_token_number;
 
-  tags = XCALLOC (char *, nsyms + 1);
-  user_toknums = XCALLOC (short, nsyms + 1);
-
-  sprec = XCALLOC (short, nsyms);
-  sassoc = XCALLOC (short, nsyms);
+  symbols = XCALLOC (bucket *, nsyms);
 
   max_user_token_number = 256;
   last_user_token_number = 256;
@@ -1644,10 +1637,7 @@ packsymbols (void)
            max_user_token_number = bp->user_token_number;
        }
 
-      tags[bp->value] = bp->tag;
-      user_toknums[bp->value] = bp->user_token_number;
-      sprec[bp->value] = bp->prec;
-      sassoc[bp->value] = bp->assoc;
+      symbols[bp->value] = bp;
     }
 
   token_translations_init ();