From: Akim Demaille <demaille@gostai.com>
Date: Thu, 21 Aug 2008 20:12:35 +0000 (+0200)
Subject: Simplify lalr1.cc since %defines is mandatory.
X-Git-Tag: v2.7.90~1068
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/c944f7f22d09d190e536f340bb0a2004c2003aad?ds=inline

Simplify lalr1.cc since %defines is mandatory.

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

diff --git a/ChangeLog b/ChangeLog
index 0409a5de..7931aaff 100644
--- 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 e6e11c35..056c6bd0 100644
--- 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