changecom

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * src/output.c (output_skeleton): Don't disable M4sugar comments
        too soon: it results in comments being expanded.
        * data/yacc.c, data/glr.c, data/lalr1.cc: Do it right before the
        first output.

Index: data/glr.c
===================================================================
RCS file: /cvsroot/bison/bison/data/glr.c,v
retrieving revision 1.24
diff -u -u -r1.24 glr.c
--- data/glr.c 24 Oct 2002 10:01:52 -0000 1.24
+++ data/glr.c 24 Oct 2002 11:37:20 -0000
@@ -111,6 +111,8 @@
                                 [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
 
 
+# We do want M4 expansion after # for CPP macros.
+m4_changecom()
 m4_divert(0)dnl
 #output "b4_output_parser_name"
 b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])
Index: data/lalr1.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/lalr1.cc,v
retrieving revision 1.11
diff -u -u -r1.11 lalr1.cc
--- data/lalr1.cc 24 Oct 2002 10:01:52 -0000 1.11
+++ data/lalr1.cc 24 Oct 2002 11:37:20 -0000
@@ -105,6 +105,8 @@
                    [])])
 
 
+# We do want M4 expansion after # for CPP macros.
+m4_changecom()
 m4_divert(0)dnl
 #output "b4_output_header_name"
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
Index: data/yacc.c
===================================================================
RCS file: /cvsroot/bison/bison/data/yacc.c,v
retrieving revision 1.26
diff -u -u -r1.26 yacc.c
--- data/yacc.c 24 Oct 2002 10:01:52 -0000 1.26
+++ data/yacc.c 24 Oct 2002 11:37:20 -0000
@@ -156,7 +156,8 @@
 ])
 
 
-
+# We do want M4 expansion after # for CPP macros.
+m4_changecom()
 m4_divert(0)dnl
 #output "b4_output_parser_name"
 b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
Index: src/output.c
===================================================================
RCS file: /cvsroot/bison/bison/src/output.c,v
retrieving revision 1.201
diff -u -u -r1.201 output.c
--- src/output.c 20 Oct 2002 11:20:15 -0000 1.201
+++ src/output.c 24 Oct 2002 11:37:21 -0000
@@ -527,10 +527,6 @@
     error (EXIT_FAILURE, errno, "fdopen");
 
   /* Output the definitions of all the muscles.  */
-
-  /* There are no comments, especially not `#': we do want M4 expansion
-     after `#': think of CPP macros!  */
-  fputs ("m4_changecom()\n", out);
   fputs ("m4_init()\n", out);
 
   user_actions_output (out);