From: Joel E. Denny <jdenny@ces.clemson.edu>
Date: Sun, 21 May 2006 08:11:30 +0000 (+0000)
Subject: * data/yacc.c (yyparse): Wrap the final return from yyparse inside YYID
X-Git-Tag: v2.3b~391
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/7b5cdcbd176bf71ef4a16977d557cb56d1602511

* data/yacc.c (yyparse): Wrap the final return from yyparse inside YYID
to make sure that YYID will never be unused.  This fixes a 'make
maintainer-check' failure caused by the recent changes to the 'Trivial
grammars' test case, which caused g++ 4.1.0 to complain that YYID was
not used.
* data/glr.c (yyparse): Wrap yyparse's return inside YYID just in case.
---

diff --git a/ChangeLog b/ChangeLog
index bfe0b48c..1a5f3463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-21  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+	* data/yacc.c (yyparse): Wrap the final return from yyparse inside YYID
+	to make sure that YYID will never be unused.  This fixes a 'make
+	maintainer-check' failure caused by the recent changes to the 'Trivial
+	grammars' test case, which caused g++ 4.1.0 to complain that YYID was
+	not used.
+	* data/glr.c (yyparse): Wrap yyparse's return inside YYID just in case.
+
 2006-05-21  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	* data/glr.c (yyresolveLocations): Remove bogus YYASSERT that the
diff --git a/data/glr.c b/data/glr.c
index 7c9443ea..486b8b98 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -2523,7 +2523,8 @@ b4_syncline([@oline@], [@ofile@])])dnl
       yyfreeGLRStack (&yystack);
     }
 
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 /* DEBUGGING ONLY */
diff --git a/data/yacc.c b/data/yacc.c
index 289bee8a..f518c956 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1480,7 +1480,8 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 ]}