* 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.
This commit is contained in:
Akim Demaille
2002-10-24 11:40:27 +00:00
parent f1886bb280
commit b526ee6116
5 changed files with 13 additions and 5 deletions

View File

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

View File

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

View File

@@ -105,6 +105,8 @@ m4_define([b4_constructor],
[])]) [])])
# We do want M4 expansion after # for CPP macros.
m4_changecom()
m4_divert(0)dnl m4_divert(0)dnl
#output "b4_output_header_name" #output "b4_output_header_name"
b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison], b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],

View File

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

View File

@@ -527,10 +527,6 @@ output_skeleton (void)
error (EXIT_FAILURE, errno, "fdopen"); error (EXIT_FAILURE, errno, "fdopen");
/* Output the definitions of all the muscles. */ /* 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); fputs ("m4_init()\n", out);
user_actions_output (out); user_actions_output (out);