X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d8cb51834b4b8ec018d3262238df526078c78159..4134cae3c5ff2fc3346ebc5b10d5c25c72c72cfe:/src/reader.c

diff --git a/src/reader.c b/src/reader.c
index 31af907d..49e5158e 100644
--- 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');
 
@@ -1111,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, '{');
@@ -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",
-		    lineno, quotearg_style (c_quoting_style, infile));
+		    lineno, quotearg_style (c_quoting_style,
+					    macro_find ("filename")));
   obstack_1grow (&guard_obstack, '{');
 
   count = 0;
@@ -1666,21 +1669,21 @@ readgram (void)
 }
 
 /* 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;
-  struct obstack uc_obstack;
+  struct obstack el_obstack;
   
-  obstack_init (&uc_obstack);
+  obstack_init (&el_obstack);
 
   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));
 }