Simplify lalr1.cc since %defines is mandatory.

	* data/lalr1.cc: Remove useless calls to b4_defines_if.

diff --git a/ChangeLog b/ChangeLog
index 0409a5debfee265ac31831ead66a8c1516c739bc..7931aaffbdfea98522d06fbc6b8dd96d9e6621a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11  Akim Demaille  <demaille@gostai.com>
+
+       Simplify lalr1.cc since %defines is mandatory.
+       * data/lalr1.cc: Remove useless calls to b4_defines_if.
+
 2008-11-11  Akim Demaille  <demaille@gostai.com>
 
        TODO: yyfmt.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index e6e11c3569b0b12e0a43cfdbb6f3d7978743ab13..056c6bd0dd1f1c75d6ca3a0a3c0c8f5a0aea568b 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -316,8 +316,7 @@ m4_include(b4_pkgdatadir/[location.cc])
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert_push(0)dnl
-b4_defines_if(
-[@output(b4_spec_defines_file@)@
+@output(b4_spec_defines_file@)@
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 dnl FIXME: This is wrong, we want computed header guards.
 [
@@ -748,7 +747,6 @@ m4_ifdef([b4_stype],
 b4_percent_code_get([[provides]])[]dnl
 
 [#endif /* ! defined PARSER_HEADER_H */]
-])dnl
 @output(b4_parser_file_name@)@
 b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])
 b4_percent_code_get([[top]])[]dnl
@@ -758,10 +756,9 @@ m4_if(b4_prefix, [yy], [],
 #define yylex   b4_prefix[]lex])[
 
 /* First part of user declarations.  */
-]b4_user_pre_prologue
+]b4_user_pre_prologue[
 
-b4_defines_if([[
-#include "@basename(]b4_spec_defines_file[@)"]])[
+#include "@basename(]b4_spec_defines_file[@)"
 
 /* User implementation prologue.  */
 ]b4_user_post_prologue