Re: assert failure at line 1896

[Joel E. Denny]

On Sat, 20 May 2006, Paul Eggert wrote:

> Index: tests/regression.at
> ===================================================================
> RCS file: /cvsroot/bison/bison/tests/regression.at,v
> retrieving revision 1.97
> diff -p -u -r1.97 regression.at
> --- tests/regression.at       15 May 2006 06:13:53 -0000      1.97
> +++ tests/regression.at       21 May 2006 04:36:59 -0000
> @@ -31,6 +31,7 @@ AT_DATA_GRAMMAR([input.y],
>  [[%{
>  void yyerror (char const *);
>  int yylex (void);
> +#define YYSTYPE int *
>  %}

This breaks make maintainer-check for me.  I installed the following to 
fix it.

Joel

2006-05-21  Joel E. Denny  <address@hidden>
 
        * 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.

Index: data/glr.c
===================================================================
RCS file: /sources/bison/bison/data/glr.c,v
retrieving revision 1.176
diff -p -u -r1.176 glr.c
--- data/glr.c  21 May 2006 06:22:36 -0000      1.176
+++ data/glr.c  21 May 2006 07:58:18 -0000
@@ -2523,7 +2523,8 @@ b4_syncline(address@hidden@], address@hidden@])])dnl
       yyfreeGLRStack (&yystack);
     }
 
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 /* DEBUGGING ONLY */
Index: data/yacc.c
===================================================================
RCS file: /sources/bison/bison/data/yacc.c,v
retrieving revision 1.140
diff -p -u -r1.140 yacc.c
--- data/yacc.c 15 May 2006 06:13:53 -0000      1.140
+++ data/yacc.c 21 May 2006 07:58:20 -0000
@@ -1480,7 +1480,8 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  return yyresult;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 ]}