Update

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index e46d5fab976684a52389be864c18c7ecd0f5425b..49e5158e1e030ae34aa82dcef0676eb88151f040 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -749,7 +749,8 @@ parse_union_decl (void)
 
   if (!no_lines_flag)
     obstack_fgrow2 (&attrs_obstack, "\n#line %d %s\n",
 
   if (!no_lines_flag)
     obstack_fgrow2 (&attrs_obstack, "\n#line %d %s\n",

-                   lineno, quotearg_style (c_quoting_style, infile));
+                   lineno, quotearg_style (c_quoting_style, 
+                                           macro_find("filename")));

   else
     obstack_1grow (&attrs_obstack, '\n');
 
   else
     obstack_1grow (&attrs_obstack, '\n');
 


@@ -1111,7 +1112,8 @@ copy_action (symbol_list *rule, int stack_offset)
   if (!no_lines_flag)
     {
       sprintf (buf, "#line %d %s\n",
   if (!no_lines_flag)
     {
       sprintf (buf, "#line %d %s\n",

-              lineno, quotearg_style (c_quoting_style, infile));
+              lineno, quotearg_style (c_quoting_style, 
+                                      macro_find ("filename")));

       obstack_grow (&action_obstack, buf, strlen (buf));
     }
   obstack_1grow (&action_obstack, '{');
       obstack_grow (&action_obstack, buf, strlen (buf));
     }
   obstack_1grow (&action_obstack, '{');


@@ -1199,7 +1201,8 @@ copy_guard (symbol_list *rule, int stack_offset)
   obstack_fgrow1 (&guard_obstack, "\ncase %d:\n", nrules);
   if (!no_lines_flag)
     obstack_fgrow2 (&guard_obstack, "#line %d %s\n",
   obstack_fgrow1 (&guard_obstack, "\ncase %d:\n", nrules);
   if (!no_lines_flag)
     obstack_fgrow2 (&guard_obstack, "#line %d %s\n",

-                   lineno, quotearg_style (c_quoting_style, infile));
+                   lineno, quotearg_style (c_quoting_style,
+                                           macro_find ("filename")));

   obstack_1grow (&guard_obstack, '{');
 
   count = 0;
   obstack_1grow (&guard_obstack, '{');
 
   count = 0;


@@ -1650,24 +1653,6 @@ readgram (void)
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 

-#if 0 /* This code is in the skeleton now.  */
-  /* JF put out same default YYSTYPE as YACC does */
-  if (typed == 0
-      && !value_components_used)
-    {
-      /* We used to use `unsigned long' as YYSTYPE on MSDOS,
-         but it seems better to be consistent.
-         Most programs should declare their own type anyway.  */
-      obstack_sgrow (&attrs_obstack,
-                          "#ifndef YYSTYPE\n#define YYSTYPE int\n#endif\n");
-      if (defines_flag)
-       obstack_sgrow (&defines_obstack, "\
-# ifndef YYSTYPE\n\
-#  define YYSTYPE int\n\
-# endif\n");
-    }
-#endif
-

   /* Report any undefined symbols and consider them nonterminals.  */
 
   for (bp = firstsymbol; bp; bp = bp->next)
   /* Report any undefined symbols and consider them nonterminals.  */
 
   for (bp = firstsymbol; bp; bp = bp->next)


@@ -1684,21 +1669,21 @@ readgram (void)
 }
 
 /* At the end of the grammar file, some C source code must
 }
 
 /* At the end of the grammar file, some C source code must

-   be stored. It is going to be associated to the user_code
+   be stored. It is going to be associated to the epilogue

    directive.  */
 static void
 read_additionnal_code (void)
 {
   char c;
    directive.  */
 static void
 read_additionnal_code (void)
 {
   char c;

-  struct obstack uc_obstack;
+  struct obstack el_obstack;

   
   

-  obstack_init (&uc_obstack);
+  obstack_init (&el_obstack);

 
   while ((c = getc (finput)) != EOF)
 
   while ((c = getc (finput)) != EOF)

-    obstack_1grow (&uc_obstack, c);
+    obstack_1grow (&el_obstack, c);

   
   

-  obstack_1grow (&uc_obstack, 0);
-  macro_insert ("user_code", obstack_finish (&uc_obstack));
+  obstack_1grow (&el_obstack, 0);
+  macro_insert ("epilogue", obstack_finish (&el_obstack));

 }
 
 \f
 }
 
 \f


@@ -1747,8 +1732,6 @@ output_token_defines (struct obstack *oout)
       if (semantic_parser)
        obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
     }
       if (semantic_parser)
        obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
     }

-
-  /* obstack_1grow (oout, '\n'); */

 }
 
 
 }
 
 


@@ -1767,8 +1750,6 @@ packsymbols (void)
   int last_user_token_number;
   static char DOLLAR[] = "$";
 
   int last_user_token_number;
   static char DOLLAR[] = "$";
 

-  /* int lossage = 0; JF set but not used */
-

   tags = XCALLOC (char *, nsyms + 1);
   tags[0] = DOLLAR;
   user_toknums = XCALLOC (short, nsyms + 1);
   tags = XCALLOC (char *, nsyms + 1);
   tags[0] = DOLLAR;
   user_toknums = XCALLOC (short, nsyms + 1);


@@ -1874,8 +1855,10 @@ packsymbols (void)
   obstack_1grow (&output_obstack, 0);
   macro_insert ("tokendef", obstack_finish (&output_obstack));
 
   obstack_1grow (&output_obstack, 0);
   macro_insert ("tokendef", obstack_finish (&output_obstack));
 

-  /* if (!no_parser_flag)
-     output_token_defines (&table_obstack); */
+#if 0
+  if (!no_parser_flag)
+    output_token_defines (&table_obstack);
+#endif

 
   if (startval->class == unknown_sym)
     fatal (_("the start symbol %s is undefined"), startval->tag);
 
   if (startval->class == unknown_sym)
     fatal (_("the start symbol %s is undefined"), startval->tag);


@@ -2053,11 +2036,6 @@ reader (void)
 #if 0
   if (defines_flag)
     reader_output_yylsp (&defines_obstack);
 #if 0
   if (defines_flag)
     reader_output_yylsp (&defines_obstack);

-#endif
-  /* Write closing delimiters for actions and guards.  */
-#if 0
-  if (locations_flag)
-    obstack_sgrow (&table_obstack, "#define YYLSP_NEEDED 1\n\n");

 #endif
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */
 #endif
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */