Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix %error-verbose for conflicts resolved by %nonassoc.

Browse Source 
* NEWS (2.5): Document.
* data/glr.c (yyreportSyntaxError): Fix this by checking
yyis_table_ninf.
* data/yacc.c (yysyntax_error): Likewise.
* data/lalr1.cc (yysyntax_error_): Fix this by checking
yytable_ninf_.
* data/lalr1.java (yysyntax_error): Likewise.
* tests/conflicts.at (%nonassoc and eof): Update expected output
and remove FIXME.
This commit is contained in:
Joel E. Denny
2009-08-25 01:13:02 -04:00
parent 8741288212
commit 53f036ce02
9 changed files with 369 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/lalr1.cc
View File

@@ -971,7 +971,8 @@ b4_error_verbose_if([state_type yystate, int yytoken],
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
yyarg[yycount++] = yytname_[yytoken];
for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_)
if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
&& yytable_[yyx + yyn] != yytable_ninf_)
{
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
{