From f1246164909d4ef9f27c72ee02333a4c1f81d7b8 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 28 Jun 2012 16:59:47 +0200 Subject: [PATCH] fix merge. * data/bison.m4: Use b4_error_verbose_if after it was defined. --- data/bison.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ## -- 2.47.2