From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 13 Nov 2002 07:46:19 +0000 (+0000)
Subject: (yydoAction): Return YYRESULTTAG, not int.
X-Git-Tag: BISON-1_875~274
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/ff032592794e7184132dcdce1581229ab3716aa3

(yydoAction): Return YYRESULTTAG, not int.
(yyglrReduce): Return yyok, not 0.
This should avoid the enumerated-type warnings reported
by Nelson H. F. Beebe in
<http://mail.gnu.org/pipermail/bug-bison/2002-November/001872.html>.
---

diff --git a/data/glr.c b/data/glr.c
index fe99165b..65175b9b 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -1022,7 +1022,7 @@ yyglrShiftDefer (yyGLRStack* yystack, int yyk, yyStateNum yylrState,
  *  have been previously resolved. Set *VALP to the resulting value,
  *  and *LOCP to the computed location (if any).  Return value is as
  *  for userAction. */
-static inline int
+static inline YYRESULTTAG
 yydoAction (yyGLRStack* yystack, int yyk, yyRuleNum yyrule,
  	    YYSTYPE* yyvalp, YYLTYPE* yylocp]b4_user_formals[)
 {
@@ -1168,7 +1168,7 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
 		    yymarkStackDeleted (yystack, yyk);
 		    YYDPRINTF ((stderr, "Merging stack %d into stack %d.\n",
 				yyk, yyi));
-		    return 0;
+		    return yyok;
 		  }
 		yyp = yyp->yypred;
 	      }
@@ -1176,7 +1176,7 @@ yyglrReduce (yyGLRStack* yystack, size_t yyk, yyRuleNum yyrule,
       yystack->yytops.yystates[yyk] = yys;
       yyglrShiftDefer (yystack, yyk, yynewLRState, yyposn, yys0, yyrule]b4_pure_args[);
     }
-  return 0;
+  return yyok;
 }
 
 static int