* src/bison.simple: Remove #line just before %%epilogue. It

is now handled in ...
* src/reader.c (read_additionnal_code): Add the output of a
#line for the epilogue.

diff --git a/ChangeLog b/ChangeLog
index 2e2cbb0d484ee6ab6736d598ac0444393f7e2626..a48a2ac741257f4b6a792b4dd8e521f36b2fec66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-11  Marc Autret  <autret_m@epita.fr>
+
+       * src/bison.simple: Remove #line just before %%epilogue. It
+       is now handled in ...
+       * src/reader.c (read_additionnal_code): Add the output of a
+       #line for the epilogue.
+
 2001-12-10  Marc Autret  <autret_m@epita.fr>
 
        * src/reader.c (copy_definition): Re-use CPP-outed code which 

diff --git a/src/bison.simple b/src/bison.simple
index 6228f2be8b821a84287bb975cf390773717d49e4..1385e1a4cc42847c3b37e47fc65188319bf990cc 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -1102,5 +1102,4 @@ yyreturn:
   return yyresult;
 }
 
-#line %%input-line "%%filename"
 %%epilogue

diff --git a/src/reader.c b/src/reader.c
index 099ce3090fff2e3133113c75965f3c6c41b93c4c..d42d90ecc9492b62c7f99761eef379c190feae57 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1688,6 +1688,13 @@ read_additionnal_code (void)
 
   obstack_init (&el_obstack);
 
+  if (!no_lines_flag)
+    {
+      obstack_fgrow2 (&el_obstack, muscle_find ("linef"),
+                     lineno, quotearg_style (c_quoting_style,
+                                             muscle_find("filename")));
+    }
+
   while ((c = getc (finput)) != EOF)
     obstack_1grow (&el_obstack, c);