From a67cef01b1c25ef62f7e50005af354a475d1e828 Mon Sep 17 00:00:00 2001 From: Tim Van Holder Date: Mon, 7 Jan 2002 23:00:39 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ lib/hash.h | 6 ++++++ src/Makefile.am | 2 ++ src/parse-skel.y | 3 ++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5b43af96..92ebe964 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-01-07 Tim Van Holder + + * 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 * src/reader.c (parse_braces): Don't fetch the next char, the diff --git a/lib/hash.h b/lib/hash.h index 73a83e02..a19b7bf1 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -21,6 +21,12 @@ #include +#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 1b0b9ba9..416e216c 100644 --- 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 2b85bb30..34445f3f 100644 --- 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 -- 2.45.2