[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bison patches to accommodate recent gnulib changes to verify.h
From: |
Paul Eggert |
Subject: |
bison patches to accommodate recent gnulib changes to verify.h |
Date: |
Mon, 26 Sep 2005 23:09:48 -0700 |
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) |
I installed this, so that Bison uses gnulib verify rather than rolling
its own (conflicting) version.
2005-09-26 Paul Eggert <address@hidden>
* bootstrap (gnulib_modules): Add verify.
* lib/.cvsignore: Add verify.h.
* src/getargs.c: Use ARGMATCH_VERIFY rather than verify.
* src/system.h (verify): Remove.
Include verify.h instead.
* src/tables.c (tables_generate): Use new API for 'verify'.
Index: bootstrap
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap,v
retrieving revision 1.27
diff -p -u -r1.27 bootstrap
--- bootstrap 21 Sep 2005 19:54:48 -0000 1.27
+++ bootstrap 27 Sep 2005 06:07:57 -0000
@@ -109,6 +109,7 @@ stdbool
stdio-safer
stpcpy
unistd-safer
+verify
xalloc
xalloc-die
xstrndup
Index: lib/.cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/lib/.cvsignore,v
retrieving revision 1.15
diff -p -u -r1.15 .cvsignore
--- lib/.cvsignore 8 Sep 2005 21:49:23 -0000 1.15
+++ lib/.cvsignore 27 Sep 2005 06:07:57 -0000
@@ -54,6 +54,7 @@ strnlen.h
unistd--.h
unistd-safer.h
unlocked-io.h
+verify.h
xalloc-die.c
xalloc.h
xmalloc.c
Index: src/getargs.c
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.c,v
retrieving revision 1.63
diff -p -u -r1.63 getargs.c
--- src/getargs.c 24 Jul 2005 07:24:22 -0000 1.63
+++ src/getargs.c 27 Sep 2005 06:07:57 -0000
@@ -103,11 +103,11 @@ static const int trace_types[] =
trace_all
};
+ARGMATCH_VERIFY (trace_args, trace_types);
static void
trace_argmatch (char *args)
{
- verify (trace_constraint, ARGMATCH_CONSTRAINT (trace_args, trace_types));
if (args)
{
args = strtok (args, ",");
@@ -156,11 +156,11 @@ static const int report_types[] =
report_all
};
+ARGMATCH_VERIFY (report_args, report_types);
static void
report_argmatch (char *args)
{
- verify (report_constraint, ARGMATCH_CONSTRAINT (report_args, report_types));
args = strtok (args, ",");
do
{
Index: src/system.h
===================================================================
RCS file: /cvsroot/bison/bison/src/system.h,v
retrieving revision 1.68
diff -p -u -r1.68 system.h
--- src/system.h 24 Jul 2005 07:24:22 -0000 1.68
+++ src/system.h 27 Sep 2005 06:07:57 -0000
@@ -30,9 +30,6 @@
#include <stdlib.h>
#include <string.h>
-/* Verify a requirement at compile-time (unlike assert, which is runtime). */
-#define verify(name, assertion) struct name {char name[(assertion) ? 1 : -1];}
-
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -54,6 +51,7 @@
typedef size_t uintptr_t;
#endif
+#include <verify.h>
#include <xalloc.h>
Index: src/tables.c
===================================================================
RCS file: /cvsroot/bison/bison/src/tables.c,v
retrieving revision 1.28
diff -p -u -r1.28 tables.c
--- src/tables.c 24 Jul 2005 07:24:22 -0000 1.28
+++ src/tables.c 27 Sep 2005 06:07:57 -0000
@@ -810,9 +810,8 @@ tables_generate (void)
/* This is a poor way to make sure the sizes are properly
correlated. In particular the signedness is not taken into
account. But it's not useless. */
- verify (sizes_are_properly_correlated,
- (sizeof nstates <= sizeof nvectors
- && sizeof nvars <= sizeof nvectors));
+ verify (sizeof nstates <= sizeof nvectors
+ && sizeof nvars <= sizeof nvectors);
nvectors = state_number_as_int (nstates) + nvars;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- bison patches to accommodate recent gnulib changes to verify.h,
Paul Eggert <=