* lib/hash.h (__P): Added definition for this macro.

* src/Makefile.am: Add parse-skel.c and scan-skel.c to BUILT_SOURCES, to ensure they are generated first.
* src/parse-skel.y: Use YYERROR_VERBOSE instead of %error-verbose to allow bootstrapping with bison 1.30x.

diff --git a/ChangeLog b/ChangeLog
index 5b43af9635466d0ede9d10727e520b790904868c..92ebe964f0c294a8fe5af6f312e0cfda621b98de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-07  Tim Van Holder  <tim.van.holder@pandora.be>
+
+       * lib/hash.h (__P): Added definition for this macro.
+       * src/Makefile.am: Add parse-skel.c and scan-skel.c to
+       BUILT_SOURCES, to ensure they are generated first.
+       * src/parse-skel.y: Use YYERROR_VERBOSE instead of
+       %error-verbose to allow bootstrapping with bison 1.30x.
+
 2002-01-06  Akim Demaille  <akim@epita.fr>
 
        * src/reader.c (parse_braces): Don't fetch the next char, the

diff --git a/lib/hash.h b/lib/hash.h
index 73a83e02157650c79030f1340d637122aa7d03e1..a19b7bf1606fcb75697741d444f611eb067d0838 100644 (file)
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -21,6 +21,12 @@
 
 #include <stdio.h>
 
+#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#define __P(args) args
+#else
+#define __P(args) ()
+#endif  /* GCC.  */
+
 typedef unsigned long (*hash_func_t) __P((void const *key));
 typedef int (*hash_cmp_func_t) __P((void const *x, void const *y));
 typedef void (*hash_map_func_t) __P((void const *item));

diff --git a/src/Makefile.am b/src/Makefile.am
index 1b0b9ba9bd1626771cad4ec2d4f16be4a182c765..416e216cee71f4339244fa77a21ca0e446b545be 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,6 +47,8 @@ bison_SOURCES = LR0.c closure.c complain.c conflicts.c        \
     print.c reader.c reduce.c symtab.c warshall.c vcg.c \
     skeleton.h parse-skel.h parse-skel.y scan-skel.l
 
+BUILT_SOURCES = parse-skel.c scan-skel.c
+
 EXTRA_bison_SOURCES = vmsgetargs.c
 
 noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \

diff --git a/src/parse-skel.y b/src/parse-skel.y
index 2b85bb30650712b03932db0ef3c381b012e7e4b9..34445f3f1472e6d552bc633ab65bcf7298351a27 100644 (file)
--- a/src/parse-skel.y
+++ b/src/parse-skel.y
@@ -22,7 +22,6 @@
 %debug
 %defines
 %verbose
-%error-verbose
 %locations
 %name-prefix="skel_"
 %pure-parser
@@ -37,6 +36,8 @@
 #include "skeleton.h"
 #include "muscle_tab.h"
 
+#define YYERROR_VERBOSE 1
+
 /* Pass the control structure to YYPARSE but not YYLEX (yet?). */
 #define YYPARSE_PARAM skel_control
 /* YYPARSE receives SKEL_CONTROL as a void *.  Provide a correctly