Update

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 282611d777eeca3b383016311569d941038cfbd3..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",
-                   lineno, quotearg_style (c_quoting_style, infile));
+                   lineno, quotearg_style (c_quoting_style, 
+                                           macro_find("filename")));
   else
     obstack_1grow (&attrs_obstack, '\n');
 
@@ -941,6 +942,17 @@ parse_macro_decl (void)
   macro_insert (macro_key, macro_value);
 }
 
+
+/*----------------------------------.
+| Parse what comes after %skeleton. |
+`----------------------------------*/
+
+void
+parse_skel_decl (void)
+{
+  /* Complete with parse_dquoted_param () on the CVS branch 1.29.  */
+}
+
 /*------------------------------------------.
 | Parse what comes after %header_extension. |
 `------------------------------------------*/
@@ -1051,6 +1063,10 @@ read_declarations (void)
            case tok_define:
              parse_macro_decl ();
              break;
+             
+           case tok_skel:
+             parse_skel_decl ();
+             break;
 
            case tok_noop:
              break;
@@ -1096,7 +1112,8 @@ copy_action (symbol_list *rule, int stack_offset)
   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, '{');
@@ -1184,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",
-                   lineno, quotearg_style (c_quoting_style, infile));
+                   lineno, quotearg_style (c_quoting_style,
+                                           macro_find ("filename")));
   obstack_1grow (&guard_obstack, '{');
 
   count = 0;
@@ -1635,24 +1653,6 @@ readgram (void)
   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)
@@ -1667,6 +1667,25 @@ readgram (void)
 
   ntokens = nsyms - nvars;
 }
+
+/* At the end of the grammar file, some C source code must
+   be stored. It is going to be associated to the epilogue
+   directive.  */
+static void
+read_additionnal_code (void)
+{
+  char c;
+  struct obstack el_obstack;
+  
+  obstack_init (&el_obstack);
+
+  while ((c = getc (finput)) != EOF)
+    obstack_1grow (&el_obstack, c);
+  
+  obstack_1grow (&el_obstack, 0);
+  macro_insert ("epilogue", obstack_finish (&el_obstack));
+}
+
 \f
 /*--------------------------------------------------------------.
 | For named tokens, but not literal ones, define the name.  The |
@@ -1713,8 +1732,6 @@ output_token_defines (struct obstack *oout)
       if (semantic_parser)
        obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
     }
-
-  /* obstack_1grow (oout, '\n'); */
 }
 
 
@@ -1733,8 +1750,6 @@ packsymbols (void)
   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);
@@ -1840,8 +1855,10 @@ packsymbols (void)
   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);
@@ -2009,24 +2026,16 @@ reader (void)
      TABLE_OBSTACK and FDEFINES file.  Also notice any %token, %left,
      etc. found there.  */
   read_declarations ();
-  /* Start writing the guard and action files, if they are needed.  */
-#if 0
-  output_headers ();
-#endif
   /* Read in the grammar, build grammar in list form.  Write out
      guards and actions.  */
   readgram ();
+  /* Some C code is given at the end of the grammar file. */
+  read_additionnal_code ();
   /* Now we know whether we need the line-number stack.  If we do,
      write its type into the .tab.h file.  */
 #if 0
   if (defines_flag)
     reader_output_yylsp (&defines_obstack);
-#endif
-  /* Write closing delimiters for actions and guards.  */
-#if 0
-  output_trailers (); 
-  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.  */