* 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.

diff --git a/ChangeLog b/ChangeLog
index cc9da645f6325732a75f07ab95c19d72dc29f68b..b31ebd377cb778dadab8b0a43d793349328a4816 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-24  Akim Demaille  <akim@epita.fr>
+
+       * 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.
+

 2002-10-24  Akim Demaille  <akim@epita.fr>
 
        * data/yacc.c (m4_int_type): New.
 2002-10-24  Akim Demaille  <akim@epita.fr>
 
        * data/yacc.c (m4_int_type): New.

diff --git a/data/glr.c b/data/glr.c
index 77a35afc713450c23f5e5b0a11dd4649488d2d34..4d34e5f3128cf200596ffed3839a4f963b4c7310 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -111,6 +111,8 @@ m4_define_default([b4_header_guard],
                                 [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
 
 
                                 [[^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])
 m4_divert(0)dnl
 #output "b4_output_parser_name"
 b4_copyright([Skeleton parser for GLR parsing with Bison], [2002])

diff --git a/data/lalr1.cc b/data/lalr1.cc
index b7b64c3ca7f190b4ee7416b0b439284f72832b1f..8f3ebad881526a1426d6274b924dda98d6fa0e9b 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -105,6 +105,8 @@ m4_define([b4_constructor],
                    [])])
 
 
                    [])])
 
 

+# 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],
 m4_divert(0)dnl
 #output "b4_output_header_name"
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],

diff --git a/data/yacc.c b/data/yacc.c
index 11edba30403940eb1080a422682adaf7efc815c6..0bbd482792d3847c7574b5583526fd7fad9607e3 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -156,7 +156,8 @@ m4_popdef([b4_dollar_dollar])dnl
 ])
 
 
 ])
 
 

-
+# 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],
 m4_divert(0)dnl
 #output "b4_output_parser_name"
 b4_copyright([Skeleton parser for Yacc-like parsing with Bison],

diff --git a/src/output.c b/src/output.c
index 1edf854f77117e2f4fd10c8a62c4342eb744b9d8..6395d6db62f8754860126162ab73c642c960a903 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -527,10 +527,6 @@ output_skeleton (void)
     error (EXIT_FAILURE, errno, "fdopen");
 
   /* Output the definitions of all the muscles.  */
     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);
   fputs ("m4_init()\n", out);
 
   user_actions_output (out);