* 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 bfe0b48c20898e91823c524a4b8fa6209e050595..1a5f3463af06e7daa530bd58eae6dccf485e1161 100644 (file)
--- 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 7c9443eafa4633f0f70f5f6ff3250f98f3966846..486b8b98acf58f5621806d13e0ce466e3609bdcf 100644 (file)
--- 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 289bee8ac68cc31d78817a98f4a39f105af82134..f518c9560361ab318ba96d463389c98ecd8b1376 100644 (file)
--- 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);
 ]}