From: Akim Demaille <akim@lrde.epita.fr>
Date: Thu, 28 Jun 2012 14:59:47 +0000 (+0200)
Subject: fix merge.
X-Git-Tag: v2.7.90~416
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/f1246164909d4ef9f27c72ee02333a4c1f81d7b8?ds=inline

fix merge.

* data/bison.m4: Use b4_error_verbose_if after it was defined.
---

diff --git a/data/bison.m4 b/data/bison.m4
index 5fc4f557..3e5c6f32 100644
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -336,9 +336,6 @@ b4_define_flag_if([nondeterministic])   # Whether conflicts should be handled.
 b4_define_flag_if([token_table])        # Whether yytoken_table is demanded.
 b4_define_flag_if([yacc])               # Whether POSIX Yacc is emulated.
 
-# yytoken_table is needed to support verbose errors.
-b4_error_verbose_if([m4_define([b4_token_table_flag], [1])])
-
 
 ## --------- ##
 ## Symbols.  ##
@@ -806,6 +803,9 @@ m4_define([b4_error_verbose_flag],
                    [verbose], [[1]])])
 b4_define_flag_if([error_verbose])
 
+# yytoken_table is needed to support verbose errors.
+b4_error_verbose_if([m4_define([b4_token_table_flag], [1])])
+
 
 ## ----------------------------------------------------------- ##
 ## After processing the skeletons, check that all the user's   ##