15-fyi-symbols-4.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * src/reader.c, src/reader.h (user_toknums): Remove.
        Adjust all users to use symbols[i]->user_token_number.
        
        
Index: src/output.c
--- src/output.c Fri, 28 Dec 2001 16:30:23 +0100 akim
+++ src/output.c Fri, 28 Dec 2001 16:36:04 +0100 akim
@@ -276,9 +276,16 @@
   muscle_insert ("tname", obstack_finish (&format_obstack));
 
   /* Output YYTOKNUM. */
-  output_table_data (&format_obstack, user_toknums,
-                    0, 1, ntokens + 1);
-  muscle_insert ("toknum", obstack_finish (&format_obstack));
+  {
+    short *values = XCALLOC (short, ntokens + 1);
+    for (i = 0; i < ntokens + 1; ++i)
+      values[i] = symbols[i]->user_token_number;
+    output_table_data (&format_obstack, values,
+                      0, 1, ntokens + 1);
+    muscle_insert ("toknum", obstack_finish (&format_obstack));
+    XFREE (values);
+  }
+
 
   /* Output YYR1. */
   {
@@ -1102,7 +1109,6 @@
   if (semantic_parser)
     output_stos ();
   output_rule_data ();
-  XFREE (user_toknums);
   output_actions ();
 
   prepare ();
Index: src/reader.c
--- src/reader.c Fri, 28 Dec 2001 16:33:19 +0100 akim
+++ src/reader.c Fri, 28 Dec 2001 16:34:14 +0100 akim
@@ -52,7 +52,6 @@
 } symbol_list;
 
 int lineno;
-short *user_toknums;
 static symbol_list *grammar;
 static int start_flag;
 static bucket *startval;
@@ -1567,7 +1566,6 @@
   int tokno = 1;
   int last_user_token_number;
 
-  user_toknums = XCALLOC (short, nsyms + 1);
   symbols = XCALLOC (bucket *, nsyms);
 
   max_user_token_number = 256;
@@ -1640,7 +1638,6 @@
        }
 
       symbols[bp->value] = bp;
-      user_toknums[bp->value] = bp->user_token_number;
     }
 
   token_translations_init ();
Index: src/reader.h
--- src/reader.h Fri, 28 Dec 2001 16:30:23 +0100 akim
+++ src/reader.h Fri, 28 Dec 2001 16:34:26 +0100 akim
@@ -31,6 +31,5 @@
 
 
 extern int lineno;
-extern short *user_toknums;
 
 #endif /* !READER_H_ */