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

style: glr.c: prefer returning a value rather than passing pointers

Browse Source 
This is very debatable.  This function is not pure at all, so it could
stick to returning void: that's a common coding style to tell the
difference between "real" (pure) functions and side-effecting
subroutines.  However, we already have this style elsewhere (e.g.,
yylex), and I feel the callers are somewhat nice to read this way.

* data/skeletons/glr.c (yygetLRActions): Return the action rather than
passing by pointer.
While at it, fix type of yytoken.
Adjust callers.
This commit is contained in:
Akim Demaille
2019-01-02 11:49:13 +01:00
parent 80ef7e7639
commit 6d9818b0cf
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
data/skeletons/glr.c
View File

@@ -975,7 +975,7 @@ yydefaultAction (yyStateNum yystate)
#define yytable_value_is_error(Yytable_value) \ #define yytable_value_is_error(Yytable_value) \
]b4_table_value_equals([[table]], [[Yytable_value]], [b4_table_ninf])[ ]b4_table_value_equals([[table]], [[Yytable_value]], [b4_table_ninf])[
/** Set *YYACTION to the action to take in YYSTATE on seeing YYTOKEN. /** The action to take in YYSTATE on seeing YYTOKEN.
* Result R means * Result R means
* R < 0: Reduce on rule -R. * R < 0: Reduce on rule -R.
* R = 0: Error. * R = 0: Error.
@@ -983,26 +983,25 @@ yydefaultAction (yyStateNum yystate)
* Set *YYCONFLICTS to a pointer into yyconfl to a 0-terminated list * Set *YYCONFLICTS to a pointer into yyconfl to a 0-terminated list
* of conflicting reductions. * of conflicting reductions.
*/ */
static inline void static inline int
yygetLRActions (yyStateNum yystate, int yytoken, yygetLRActions (yyStateNum yystate, yySymbol yytoken, const short** yyconflicts)
int* yyaction, const short** yyconflicts)
{ {
int yyindex = yypact[yystate] + yytoken; int yyindex = yypact[yystate] + yytoken;
if (yyisDefaultedState (yystate) if (yyisDefaultedState (yystate)
|| yyindex < 0 || YYLAST < yyindex || yycheck[yyindex] != yytoken) || yyindex < 0 || YYLAST < yyindex || yycheck[yyindex] != yytoken)
{ {
*yyaction = -yydefact[yystate];
*yyconflicts = yyconfl; *yyconflicts = yyconfl;
return -yydefact[yystate];
} }
else if (! yytable_value_is_error (yytable[yyindex])) else if (! yytable_value_is_error (yytable[yyindex]))
{ {
*yyaction = yytable[yyindex];
*yyconflicts = yyconfl + yyconflp[yyindex]; *yyconflicts = yyconfl + yyconflp[yyindex];
return yytable[yyindex];
} }
else else
{ {
*yyaction = 0;
*yyconflicts = yyconfl + yyconflp[yyindex]; *yyconflicts = yyconfl + yyconflp[yyindex];
return 0;
} }
} }
@@ -1977,7 +1976,7 @@ yyprocessOneStack (yyGLRStack* yystackp, size_t yyk,
yystackp->yytops.yylookaheadNeeds[yyk] = yytrue; yystackp->yytops.yylookaheadNeeds[yyk] = yytrue;
yytoken = ]b4_yygetToken_call[; yytoken = ]b4_yygetToken_call[;
yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts); yyaction = yygetLRActions (yystate, yytoken, &yyconflicts);
while (*yyconflicts != 0) while (*yyconflicts != 0)
{ {
@@ -2338,9 +2337,8 @@ b4_dollar_popdef])[]dnl
else else
{ {
yySymbol yytoken = ]b4_yygetToken_call;[ yySymbol yytoken = ]b4_yygetToken_call;[
int yyaction;
const short* yyconflicts; const short* yyconflicts;
yygetLRActions (yystate, yytoken, &yyaction, &yyconflicts); int yyaction = yygetLRActions (yystate, yytoken, &yyconflicts);
if (*yyconflicts != 0) if (*yyconflicts != 0)
break; break;
if (yyisShiftAction (yyaction)) if (yyisShiftAction (yyaction))
@@ -2418,10 +2416,9 @@ b4_dollar_popdef])[]dnl
yyposn += 1; yyposn += 1;
for (yys = 0; yys < yystack.yytops.yysize; yys += 1) for (yys = 0; yys < yystack.yytops.yysize; yys += 1)
{ {
int yyaction;
const short* yyconflicts;
yyStateNum yystate = yystack.yytops.yystates[yys]->yylrState; yyStateNum yystate = yystack.yytops.yystates[yys]->yylrState;
yygetLRActions (yystate, yytoken_to_shift, &yyaction, const short* yyconflicts;
int yyaction = yygetLRActions (yystate, yytoken_to_shift,
&yyconflicts); &yyconflicts);
/* Note that yyconflicts were handled by yyprocessOneStack. */ /* Note that yyconflicts were handled by yyprocessOneStack. */
YYDPRINTF ((stderr, "On stack %lu, ", (unsigned long) yys)); YYDPRINTF ((stderr, "On stack %lu, ", (unsigned long) yys));