* src/reader.c (read_additionnal_code): Rename %%user_code to

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 21711cb1404fb39b62bff767c6e231d1c50e126a..944ebb5483c0a4da2ffe60855544110edc6cff8f 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -130,7 +130,7 @@ struct obstack output_obstack;
 
 static inline void
 output_table_data (struct obstack* oout, 
-                  short* table, 
+                  short* table_data, 
                   short first, 
                   short begin, 
                   short end)
@@ -149,7 +149,7 @@ output_table_data (struct obstack* oout,
        }
       else
        ++j;
-      obstack_fgrow1 (oout, "%6d", table[i]);
+      obstack_fgrow1 (oout, "%6d", table_data[i]);
     }
   obstack_1grow (oout, 0);
 }
@@ -984,8 +984,8 @@ output_parser (void)
       else if ((c = getc (fskel)) == '%')
        {
          /* Read the macro. */
-         char* macro_key = 0;
-         char* macro_value = 0;
+         const char* macro_key = 0;
+         const char* macro_value = 0;
          while (isalnum (c = getc (fskel)) || c == '_')
            obstack_1grow (&macro_obstack, c);
          obstack_1grow (&macro_obstack, 0);
@@ -1095,7 +1095,9 @@ output (void)
 {
   obstack_init (&output_obstack);
 
-  /* reader_output_yylsp (&table_obstack); */
+#if 0
+  reader_output_yylsp (&table_obstack); */
+#endif
   free_itemsets ();
 
   output_token_translations ();
@@ -1106,11 +1108,13 @@ output (void)
     output_stos ();
   output_rule_data ();
   output_actions ();
-
-  /* if (!no_parser_flag) */
+  
+#if 0
+  if (!no_parser_flag) */
+#endif
   prepare ();
   /* Copy definitions in directive.  */
-  macro_insert ("definitions", obstack_finish (&attrs_obstack));
+  macro_insert ("prologue", obstack_finish (&attrs_obstack));
   output_parser ();
 
   obstack_free (&macro_obstack, 0);