Re: typo g++

[Paul Eggert]

address@hidden writes:

> After this patch still errors at `maintainer-check-g++' see below.

Thanks for reporting those problems.  I installed these additional
patches.

2005-07-14  Paul Eggert  <address@hidden>

        Fix problems reported by address@hidden
        * data/glr.c (YYSTACKEXPANDABLE): Don't define if already defined.
        (yyuserMerge): Provide a default case if b4_mergers is empty.
        * tests/cxx-type.at (_AT_TEST_GLR_CXXTYPES): Define YYSTACKEXPANDABLE.
        * tests/glr-regression.at
        (Improper handling of embedded actions and dollar(-N) in GLR parsers):
        YYSTYPE is char *, not char const *, so that strcpy ($$, ...) works.

Index: data/glr.c
===================================================================
RCS file: /cvsroot/bison/bison/data/glr.c,v
retrieving revision 1.98
diff -p -u -r1.98 glr.c
--- data/glr.c  14 Jul 2005 05:08:03 -0000      1.98
+++ data/glr.c  14 Jul 2005 23:07:37 -0000
@@ -556,13 +556,14 @@ int yydebug;
    properly redirected to new data. */
 #define YYHEADROOM 2
 
-#if (! defined (YYSTACKEXPANDABLE) \
-     && (! defined (__cplusplus) \
-        || (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && 
YYLTYPE_IS_TRIVIAL \
-            && ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
-#define YYSTACKEXPANDABLE 1
-#else
-#define YYSTACKEXPANDABLE 0
+#ifndef YYSTACKEXPANDABLE
+# if (! defined (__cplusplus) \
+      || (]b4_location_if([[defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL 
\
+         && ]])[defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))
+#  define YYSTACKEXPANDABLE 1
+# else
+#  define YYSTACKEXPANDABLE 0
+# endif
 #endif
 
 #if YYERROR_VERBOSE
@@ -812,6 +813,7 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYST
   switch (yyn)
     {
       b4_mergers
+      default: break;
     }
 }
 [
Index: tests/cxx-type.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/cxx-type.at,v
retrieving revision 1.20
diff -p -u -r1.20 cxx-type.at
--- tests/cxx-type.at   14 Jul 2005 17:27:01 -0000      1.20
+++ tests/cxx-type.at   14 Jul 2005 23:07:37 -0000
@@ -38,6 +38,7 @@ $1
 ]m4_bmatch([$2], [stmtMerge],
 [ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[
   #define YYINITDEPTH 10
+  #define YYSTACKEXPANDABLE 1
   static char *format (char const *, ...);
   struct YYLTYPE;
 #if YYPURE
Index: tests/glr-regression.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/glr-regression.at,v
retrieving revision 1.7
diff -p -u -r1.7 glr-regression.at
--- tests/glr-regression.at     14 Jul 2005 21:42:40 -0000      1.7
+++ tests/glr-regression.at     14 Jul 2005 23:07:37 -0000
@@ -121,7 +121,7 @@ AT_DATA_GRAMMAR([glr-regr2a.y],
 /* Reported by S. Eken */
 
 %{
-  #define YYSTYPE char const *
+  #define YYSTYPE char *
   #define yyfalse 0
   #define yytrue 1