01-synclines.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        
        * data/bison.simple, data/bison.c++: Be sure to restore the
        current #line when returning to the skeleton contents after having
        exposed the input file's #line.
        
Index: data/bison.simple
--- data/bison.simple Tue, 11 Jun 2002 22:21:46 +0200 akim
+++ data/bison.simple Fri, 14 Jun 2002 17:47:33 +0200 akim
@@ -193,7 +193,9 @@ m4_define([b4_token_defines],
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-typedef union b4_stype yystype;],
+typedef union b4_stype yystype;
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"],
 [typedef int yystype;])
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1240,7 +1242,9 @@ yyreturn:
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-typedef union b4_stype yystype;],
+typedef union b4_stype yystype;
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"],
 [typedef int yystype;])
 # define YYSTYPE yystype
 #endif
Index: data/bison.c++
--- data/bison.c++ Tue, 11 Jun 2002 17:25:43 +0200 akim
+++ data/bison.c++ Fri, 14 Jun 2002 17:47:33 +0200 akim
@@ -145,6 +145,9 @@ m4_define([b4_copyright],
 /* Copy the first part of user declarations.  */
 b4_pre_prologue
 
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"
+
 /* Tokens.  */
 b4_token_defines(b4_tokens)
 
@@ -161,7 +164,9 @@ m4_define([b4_copyright],
 #ifndef YYSTYPE
 m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-typedef union b4_stype yystype;],
+typedef union b4_stype yystype;
+/* Line __line__ of __file__.  */
+#line __oline__ "__ofile__"],
 [typedef int yystype;])
 # define YYSTYPE yystype
 #endif
@@ -169,6 +174,7 @@ m4_define([b4_copyright],
 /* Copy the second part of user declarations.  */
 b4_post_prologue
 
+/* Line __line__ of __file__.  */
 #line __oline__  "__ofile__"
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \