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

(yyuserMerge): Return void, not YYSTYPE.

Browse Source 
The returned value is now stored in *YY0.  All callers changed.
This commit is contained in:
Paul Eggert
2003-08-04 19:09:15 +00:00
parent 16caa4f431
commit 7b98f503de
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/glr.c
View File

@@ -740,10 +740,9 @@ b4_syncline([@oline@], [@ofile@])
} }
static YYSTYPE static void
yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1) yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
{ {
YYSTYPE yyval = *yy0;
/* `Use' the arguments. */ /* `Use' the arguments. */
(void) yy0; (void) yy0;
(void) yy1; (void) yy1;
@@ -752,7 +751,6 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
{ {
b4_mergers b4_mergers
} }
return yyval;
} }
[ [
/* Bison grammar-table manipulation. */ /* Bison grammar-table manipulation. */
@@ -1475,7 +1473,7 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack,
YYSTYPE yyval1; YYSTYPE yyval1;
YYLTYPE yydummy; YYLTYPE yydummy;
YYCHK (yyresolveAction (yyp, yystack, &yyval1, &yydummy]b4_user_args[)); YYCHK (yyresolveAction (yyp, yystack, &yyval1, &yydummy]b4_user_args[));
*yyvalp = yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1); yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1);
} }
} }
return yyok; return yyok;