From: Akim Demaille <demaille@gostai.com>
Date: Mon, 29 Jun 2009 12:41:13 +0000 (+0200)
Subject: parse.error: fix.
X-Git-Tag: v2.7.90~849
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/ad597a78770c1834e52b7b5286b383998b92f01b

parse.error: fix.

	* data/bison.m4: Move code related to specific variables after the
	definition of the variable-maintaining macros so that we don't
	"invoke" b4_percent_define_check_values before it is defined.
---

diff --git a/ChangeLog b/ChangeLog
index 797a4932..aa23252a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-29  Akim Demaille  <demaille@gostai.com>
+
+	parse.error: fix.
+	* data/bison.m4: Move code related to specific variables after the
+	definition of the variable-maintaining macros so that we don't
+	"invoke" b4_percent_define_check_values before it is defined.
+
 2009-06-29  Akim Demaille  <demaille@gostai.com>
 
 	variables: parse.error
diff --git a/data/bison.m4 b/data/bison.m4
index c8d08528..788e8b01 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -716,31 +716,6 @@ m4_define([b4_percent_define_if_define],
 b4_percent_define_if_define_([$1], $[1], $[2])])
 
 
-# b4_parse_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT])
-# b4_parse_trace_if([IF-DEBUG-TRACES-ARE-ENABLED], [IF-NOT])
-# b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT])
-# b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT])
-# ----------------------------------------------
-b4_percent_define_if_define([lex_symbol])
-b4_percent_define_if_define([locations])     # Whether locations are tracked.
-b4_percent_define_if_define([parse.assert])
-b4_percent_define_if_define([parse.trace])
-b4_percent_define_if_define([variant])
-
-
-# b4_error_verbose_if([IF-ERRORS-ARE-VERBOSE], [IF-NOT])
-# ------------------------------------------------------
-# Map %define parse.error "(simple|verbose)" to b4_error_verbose_if and
-# b4_error_verbose_flag.
-b4_percent_define_default([[parse.error]], [[simple]])
-b4_percent_define_check_values([[[[parse.error]],
-                               [[simple]], [[verbose]]]])
-m4_case(b4_percent_define_get([[parse.error]]),
-        [simple],  [m4_define([b4_error_verbose_flag], [[0]])],
-        [verbose], [m4_define([b4_error_verbose_flag], [[1]])])
-b4_define_flag_if([error_verbose])
-
-
 # b4_percent_define_check_values(VALUES)
 # --------------------------------------
 # Mimic muscle_percent_define_check_values in ../src/muscle_tab.h exactly
@@ -815,11 +790,39 @@ m4_define([b4_percent_code_ifdef],
 	  [$3])])
 
 
+## ------------------ ##
+## Common variables.  ##
+## ------------------ ##
+
 # Default values for %define.
 # ---------------------------
 # If the api.tokens.prefix, it is empty.
 m4_percent_define_default([[api.tokens.prefix]], [[]])
 
+# b4_parse_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT])
+# b4_parse_trace_if([IF-DEBUG-TRACES-ARE-ENABLED], [IF-NOT])
+# b4_lex_symbol_if([IF-YYLEX-RETURNS-A-COMPLETE-SYMBOL], [IF-NOT])
+# b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT])
+# ----------------------------------------------
+b4_percent_define_if_define([lex_symbol])
+b4_percent_define_if_define([locations])     # Whether locations are tracked.
+b4_percent_define_if_define([parse.assert])
+b4_percent_define_if_define([parse.trace])
+b4_percent_define_if_define([variant])
+
+
+# b4_error_verbose_if([IF-ERRORS-ARE-VERBOSE], [IF-NOT])
+# ------------------------------------------------------
+# Map %define parse.error "(simple|verbose)" to b4_error_verbose_if and
+# b4_error_verbose_flag.
+b4_percent_define_default([[parse.error]], [[simple]])
+b4_percent_define_check_values([[[[parse.error]],
+                                 [[simple]], [[verbose]]]])
+m4_define([b4_error_verbose_flag],
+          m4_case(b4_percent_define_get([[parse.error]]),
+                  [simple],  [[0]],
+                  [verbose], [[1]]))
+b4_define_flag_if([error_verbose])
 
 
 ## ----------------------------------------------------------- ##