From 7b98f503de68ee0d4320c8294ca08889479cf1c1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 4 Aug 2003 19:09:15 +0000 Subject: [PATCH] (yyuserMerge): Return void, not YYSTYPE. The returned value is now stored in *YY0. All callers changed. --- data/glr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/glr.c b/data/glr.c index cce06f5b..17634dba 100644 --- a/data/glr.c +++ b/data/glr.c @@ -740,10 +740,9 @@ b4_syncline([@oline@], [@ofile@]) } -static YYSTYPE +static void yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1) { - YYSTYPE yyval = *yy0; /* `Use' the arguments. */ (void) yy0; (void) yy1; @@ -752,7 +751,6 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1) { b4_mergers } - return yyval; } [ /* Bison grammar-table manipulation. */ @@ -1475,7 +1473,7 @@ yyresolveValue (yySemanticOption* yyoptionList, yyGLRStack* yystack, YYSTYPE yyval1; YYLTYPE yydummy; YYCHK (yyresolveAction (yyp, yystack, &yyval1, &yydummy]b4_user_args[)); - *yyvalp = yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1); + yyuserMerge (yymerger[yyp->yyrule], yyvalp, &yyval1); } } return yyok; -- 2.50.0