FYI [trunk]: lines-bug2.patch

[Marc Autret]

Hi,

With this patch, the #line macros are correct.
It also makes %no-lines option working like before.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.398
diff -u -r1.398 ChangeLog
--- ChangeLog   10 Dec 2001 23:19:09 -0000      1.398
+++ ChangeLog   11 Dec 2001 20:03:00 -0000
@@ -1,3 +1,10 @@
+2001-12-11  Marc Autret  <address@hidden>
+
+       * 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  <address@hidden>
 
        * src/reader.c (copy_definition): Re-use CPP-outed code which 
Index: src/bison.simple
===================================================================
RCS file: /cvsroot/bison/bison/src/bison.simple,v
retrieving revision 1.86
diff -u -r1.86 bison.simple
--- src/bison.simple    10 Dec 2001 23:19:09 -0000      1.86
+++ src/bison.simple    11 Dec 2001 20:03:01 -0000
@@ -1102,5 +1102,4 @@
   return yyresult;
 }
 
-#line %%input-line "%%filename"
 %%epilogue
Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.114
diff -u -r1.114 reader.c
--- src/reader.c        10 Dec 2001 23:19:09 -0000      1.114
+++ src/reader.c        11 Dec 2001 20:03:04 -0000
@@ -1688,6 +1688,13 @@
 
   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);
 


-- 
Marc Autret