glr: style changes

* data/skeletons/glr.c (yytnamerr): here.
(yyprocessOneStack): Initialize variables.
This commit is contained in:
Akim Demaille
2019-10-12 11:19:19 +02:00
parent a428a9fa6c
commit d563a01709

View File

@@ -614,10 +614,10 @@ yytnamerr (char *yyres, const char *yystr)
do_not_strip_quotes: ; do_not_strip_quotes: ;
} }
if (! yyres) if (yyres)
return yystpcpy (yyres, yystr) - yyres;
else
return (ptrdiff_t) strlen (yystr); return (ptrdiff_t) strlen (yystr);
return yystpcpy (yyres, yystr) - yyres;
} }
# endif # endif
@@ -672,7 +672,8 @@ struct yyGLRStateSet {
* operation, yylookaheadNeeds[0] is not maintained since it would merely * operation, yylookaheadNeeds[0] is not maintained since it would merely
* duplicate yychar != YYEMPTY. */ * duplicate yychar != YYEMPTY. */
yybool* yylookaheadNeeds; yybool* yylookaheadNeeds;
ptrdiff_t yysize, yycapacity; ptrdiff_t yysize;
ptrdiff_t yycapacity;
}; };
struct yySemanticOption { struct yySemanticOption {
@@ -1991,13 +1992,10 @@ yyprocessOneStack (yyGLRStack* yystackp, ptrdiff_t yyk,
} }
else else
{ {
yySymbol yytoken; yySymbol yytoken = ]b4_yygetToken_call[;
int yyaction;
const short* yyconflicts; const short* yyconflicts;
const int yyaction = yygetLRActions (yystate, yytoken, &yyconflicts);
yystackp->yytops.yylookaheadNeeds[yyk] = yytrue; yystackp->yytops.yylookaheadNeeds[yyk] = yytrue;
yytoken = ]b4_yygetToken_call[;
yyaction = yygetLRActions (yystate, yytoken, &yyconflicts);
while (*yyconflicts != 0) while (*yyconflicts != 0)
{ {