Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 17:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

skeletons: avoid b4_error_verbose_if, which is confusing

Browse Source 
parse.error has more than two possible values.

* data/skeletons/bison.m4 (b4_error_verbose_if, b4_error_verbose_flag):
Remove.
(b4_parse_error_case, b4_parse_error_bmatch): New.
Adjust dependencies.
This commit is contained in:
Akim Demaille
2020-02-10 07:23:03 +01:00
parent 8dd8137c38
commit bc74b4b15a
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/skeletons/lalr1.cc
View File

@@ -284,8 +284,7 @@ m4_define([b4_shared_declarations],
// Tables.
]b4_parser_tables_declare[
]m4_case(b4_percent_define_get([[parse.error]]),
[verbose], [[
]b4_parse_error_case([verbose], [[
/// Convert the symbol name \a n to a form suitable for a diagnostic.
static std::string yytnamerr_ (const char *n);
@@ -560,7 +559,7 @@ m4_if(b4_prefix, [yy], [],
#define YYERROR goto yyerrorlab
#define YYRECOVERING() (!!yyerrstatus_)
]b4_namespace_open[]b4_error_verbose_if([[
]b4_namespace_open[]b4_parse_error_case([verbose], [[
/* Return YYSTR after stripping away unnecessary quotes and
backslashes, so that it's suitable for yyerror. The heuristic is
@@ -1311,10 +1310,10 @@ b4_dollar_popdef])[]dnl
// Generate an error message.
std::string
]b4_parser_class[::yysyntax_error_ (]dnl
b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
[state_type, const symbol_type&])[) const
{]b4_error_verbose_if([[
]b4_parser_class[::yysyntax_error_ (]b4_parse_error_case([verbose],
[state_type yystate, const symbol_type& yyla],
[state_type, const symbol_type&])[) const
{]b4_parse_error_case([verbose], [[
// Number of reported tokens (one for the "unexpected", one per
// "expected").
std::ptrdiff_t yycount = 0;