From: Akim Demaille <akim@lrde.epita.fr>
Date: Thu, 19 Sep 2013 13:01:24 +0000 (+0200)
Subject: glr: shorten scopes
X-Git-Tag: v3.0.1~26
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/5a6e85fb8d223b0decb8fdc10465daf00d2cdf66

glr: shorten scopes

* data/glr.c (yyglrReduce): Define yyflag with its value.
---

diff --git a/data/glr.c b/data/glr.c
index 03a2d078..e30653cc 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -1318,11 +1318,10 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
 
   if (yyforceEval || yystackp->yysplitPoint == YY_NULL)
     {
-      YYRESULTTAG yyflag;
-      YYSTYPE yysval;]b4_locations_if([
-      YYLTYPE yyloc;])[
+      YYSTYPE yysval;]b4_locations_if([[
+      YYLTYPE yyloc;]])[
 
-      yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[);
+      YYRESULTTAG yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[);
       if (yyflag == yyerr && yystackp->yysplitPoint != YY_NULL)
         {
           YYDPRINTF ((stderr, "Parse on stack %lu rejected by rule #%d.\n",