* 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'.

ChangeLog

@@ -1,3 +1,12 @@
+2005-09-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* 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'.
+
 2005-09-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Do not use

bootstrap

@@ -109,6 +109,7 @@ stdbool
 stdio-safer
 stpcpy
 unistd-safer
+verify
 xalloc
 xalloc-die
 xstrndup

lib/.cvsignore

@@ -54,6 +54,7 @@ strnlen.h
 unistd--.h
 unistd-safer.h
 unlocked-io.h
+verify.h
 xalloc-die.c
 xalloc.h
 xmalloc.c

src/getargs.c

@@ -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
     {

src/system.h

@@ -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>
 
 

src/tables.c

@@ -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;