From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Aug 2005 17:57:23 +0000 (+0000)
Subject: (yydestroyStackItem): New function.
X-Git-Tag: BISON-2_1~27
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/a4cf101a98f1ea4d84b08a9c82a3b317ecacac03?ds=inline

(yydestroyStackItem): New function.
(yyrecoverSyntaxError, yyreturn): Use it to improve quality of
debugging information.  Problem reported by Joel E. Denny.
---

diff --git a/data/glr.c b/data/glr.c
index 16608b61..96bb4b0d 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -886,6 +886,26 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
 
 ]b4_yydestruct_generate([b4_c_ansi_function_def])[
 
+static void
+yydestroyStackItem (char const *yymsg, yyGLRState *yys)
+{
+  if (yys->yyresolved)
+    yydestruct (yymsg, yystos[yys->yylrState],
+		&yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
+  else
+    {
+#if YYDEBUG
+      if (yydebug)
+	{
+	  YYFPRINTF (stderr, "%s unresolved ", yymsg);
+	  yysymprint (stderr, yystos[yys->yylrState],
+		      &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
+	  YYFPRINTF (stderr, "\n");
+	}
+#endif
+    }
+}
+
 /** Number of symbols composing the right hand side of rule #RULE. */
 static inline int
 yyrhsLength (yyRuleNum yyrule)
@@ -1981,10 +2001,7 @@ yyrecoverSyntaxError (yyGLRStack* yystack,
 	    }
 	}
 ]b4_location_if([[      yystack->yyerror_range[1].yystate.yyloc = yys->yyloc;]])[
-      if (yys->yyresolved)
-	yydestruct ("Error: popping",
-		    yystos[yys->yylrState],
-		    &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
+      yydestroyStackItem ("Error: popping", yys);
       yystack->yytops.yystates[0] = yys->yypred;
       yystack->yynextFree -= 1;
       yystack->yyspaceLeft += 1;
@@ -2184,10 +2201,7 @@ b4_syncline([@oline@], [@ofile@])])dnl
 	  {
 	    yyGLRState *yys = yystates[0];
 ]b4_location_if([[	  yystack.yyerror_range[1].yystate.yyloc = yys->yyloc;]]
-)[	    if (yys->yyresolved)
-	      yydestruct ("Cleanup: popping",
-			  yystos[yys->yylrState],
-			  &yys->yysemantics.yysval]b4_location_if([, &yys->yyloc])[);
+)[	    yydestroyStackItem ("Cleanup: popping", yys);
 	    yystates[0] = yys->yypred;
 	    yystack.yynextFree -= 1;
 	    yystack.yyspaceLeft += 1;