* src/reader.c, src/reader.h (user_toknums): Remove.

Adjust all users to use symbols[i]->user_token_number.

diff --git a/ChangeLog b/ChangeLog
index 849440c381bced541157befe8f99db112a568e0b..969bf196fa9f307a55966dab378debbcecd90e6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-29  Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c, src/reader.h (user_toknums): Remove.
+       Adjust all users to use symbols[i]->user_token_number.
+
+       

 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * src/gram.c, src/gram.h (sprec, sassoc): Remove.
 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * src/gram.c, src/gram.h (sprec, sassoc): Remove.

diff --git a/src/output.c b/src/output.c
index fe029d41622f33e0cc25f1fd243477e40df13e7a..37ce24cf89688fd58bd2d6012ac3faeed61476a6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -276,9 +276,16 @@ output_rule_data (void)
   muscle_insert ("tname", obstack_finish (&format_obstack));
 
   /* Output YYTOKNUM. */
   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. */
   {
 
   /* Output YYR1. */
   {


@@ -1102,7 +1109,6 @@ output (void)
   if (semantic_parser)
     output_stos ();
   output_rule_data ();
   if (semantic_parser)
     output_stos ();
   output_rule_data ();

-  XFREE (user_toknums);

   output_actions ();
 
   prepare ();
   output_actions ();
 
   prepare ();

diff --git a/src/reader.c b/src/reader.c
index cff0f9119a9078837b7222c1ca57273170ea487f..527194e06ea2a3c8f99f0b234c00a65461907680 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -52,7 +52,6 @@ typedef struct symbol_list
 } symbol_list;
 
 int lineno;
 } symbol_list;
 
 int lineno;

-short *user_toknums;

 static symbol_list *grammar;
 static int start_flag;
 static bucket *startval;
 static symbol_list *grammar;
 static int start_flag;
 static bucket *startval;


@@ -1567,7 +1566,6 @@ packsymbols (void)
   int tokno = 1;
   int last_user_token_number;
 
   int tokno = 1;
   int last_user_token_number;
 

-  user_toknums = XCALLOC (short, nsyms + 1);

   symbols = XCALLOC (bucket *, nsyms);
 
   max_user_token_number = 256;
   symbols = XCALLOC (bucket *, nsyms);
 
   max_user_token_number = 256;


@@ -1640,7 +1638,6 @@ packsymbols (void)
        }
 
       symbols[bp->value] = bp;
        }
 
       symbols[bp->value] = bp;

-      user_toknums[bp->value] = bp->user_token_number;

     }
 
   token_translations_init ();
     }
 
   token_translations_init ();

diff --git a/src/reader.h b/src/reader.h
index e4c77c2f0b2a97c2b8a1d9d17b06282ea10a7d29..5c6c902739039985f76beb620b5c8558b405ecdf 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -31,6 +31,5 @@ extern void reader PARAMS ((void));
 
 
 extern int lineno;
 
 
 extern int lineno;

-extern short *user_toknums;

 
 #endif /* !READER_H_ */
 
 #endif /* !READER_H_ */