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

[bison.git] / data / glr.c

diff --git a/data/glr.c b/data/glr.c
index d61390ec5c01d2f15d2a0c679345250bca26fbe8..41cb607bb9f9a557af536a60e277808d613bcde1 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -2128,7 +2128,8 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
          yyfmt = yystpcpy (yyformat, yyunexpected);
 
          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-           if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+           if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+               && !yyis_table_ninf (yytable[yyx + yyn]))
              {
                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
                  {