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

glr.c: clarify yyreportSyntaxError

Browse Source 
See the previous commit.

* data/skeletons/glr.c (yyreportSyntaxError): First compute the
arguments of the error message, _then_ th error message size.
This commit is contained in:
Akim Demaille
2019-12-31 08:23:57 +01:00
parent f983d00e77
commit 385fb345bf
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
data/skeletons/glr.c
View File

@@ -2119,8 +2119,6 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
if (yytoken != YYEMPTY) if (yytoken != YYEMPTY)
{ {
int yyn = yypact[yystackp->yytops.yystates[0]->yylrState]; int yyn = yypact[yystackp->yytops.yystates[0]->yylrState];
ptrdiff_t yysize0 = yytnamerr (YY_NULLPTR, yytokenName (yytoken));
yysize = yysize0;
yyarg[yycount++] = yytokenName (yytoken); yyarg[yycount++] = yytokenName (yytoken);
if (!yypact_value_is_default (yyn)) if (!yypact_value_is_default (yyn))
{ {
@@ -2139,17 +2137,9 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
{ {
yycount = 1; yycount = 1;
yysize = yysize0;
break; break;
} }
yyarg[yycount++] = yytokenName (yyx); yyarg[yycount++] = yytokenName (yyx);
{
ptrdiff_t yysz = yytnamerr (YY_NULLPTR, yytokenName (yyx));
if (YYSIZEMAX - yysize < yysz)
yysize_overflow = yytrue;
else
yysize += yysz;
}
} }
} }
} }
@@ -2170,14 +2160,19 @@ yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[)
#undef YYCASE_ #undef YYCASE_
} }
/* Compute error message size. Don't count the "%s"s, but reserve
room for the terminator. */
yysize = YY_CAST (ptrdiff_t, strlen (yyformat)) - 2 * yycount + 1;
{ {
/* Don't count the "%s"s in the final size, but reserve room for int yyi;
the terminator. */ for (yyi = 0; yyi < yycount; ++yyi)
ptrdiff_t yysz = YY_CAST (ptrdiff_t, strlen (yyformat)) - 2 * yycount + 1; {
if (YYSIZEMAX - yysize < yysz) ptrdiff_t yysz = yytnamerr (YY_NULLPTR, yyarg[yyi]);
yysize_overflow = yytrue; if (YYSIZEMAX - yysize < yysz)
else yysize_overflow = yytrue;
yysize += yysz; else
yysize += yysz;
}
} }
if (!yysize_overflow) if (!yysize_overflow)