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

diff --git a/ChangeLog b/ChangeLog
index 83e36b09beae27ab474182bcafbde10db7698d44..3ee2f4dbfa98b33aab001c15646636eaeae9ed01 100644 (file)
--- a/ChangeLog
+++ b/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
 2005-09-21  Paul Eggert  <eggert@cs.ucla.edu>
 
        * tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Do not use

diff --git a/bootstrap b/bootstrap
index 017517fc23c5dedd84d7e1d4f38bbca30de42305..e1e0caa44931509cbce096f98118f8e4bcfb0c32 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -109,6 +109,7 @@ stdbool
 stdio-safer
 stpcpy
 unistd-safer
 stdio-safer
 stpcpy
 unistd-safer

+verify

 xalloc
 xalloc-die
 xstrndup
 xalloc
 xalloc-die
 xstrndup

diff --git a/lib/.cvsignore b/lib/.cvsignore
index 4d1bda4b33a36929b4a0401c2c6a69afbb01f168..3f834a0b4f8058f13128f473ad9c577efc09a71b 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -54,6 +54,7 @@ strnlen.h
 unistd--.h
 unistd-safer.h
 unlocked-io.h
 unistd--.h
 unistd-safer.h
 unlocked-io.h

+verify.h

 xalloc-die.c
 xalloc.h
 xmalloc.c
 xalloc-die.c
 xalloc.h
 xmalloc.c

diff --git a/src/getargs.c b/src/getargs.c
index 0170f8e34fd4e4516043ee0b13f4e8887d38f5b7..2b6fa0fbbd11490404d39cfbd4e895e77353d9d0 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -103,11 +103,11 @@ static const int trace_types[] =
   trace_all
 };
 
   trace_all
 };
 

+ARGMATCH_VERIFY (trace_args, trace_types);

 
 static void
 trace_argmatch (char *args)
 {
 
 static void
 trace_argmatch (char *args)
 {

-  verify (trace_constraint, ARGMATCH_CONSTRAINT (trace_args, trace_types));

   if (args)
     {
       args = strtok (args, ",");
   if (args)
     {
       args = strtok (args, ",");


@@ -156,11 +156,11 @@ static const int report_types[] =
   report_all
 };
 
   report_all
 };
 

+ARGMATCH_VERIFY (report_args, report_types);

 
 static void
 report_argmatch (char *args)
 {
 
 static void
 report_argmatch (char *args)
 {

-  verify (report_constraint, ARGMATCH_CONSTRAINT (report_args, report_types));

   args = strtok (args, ",");
   do
     {
   args = strtok (args, ",");
   do
     {

diff --git a/src/system.h b/src/system.h
index 755a75cb39cf55323179f08ebb464dcbef3fddaa..feb851d6a84bfd6784a976a9f16d183a089a82fe 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -30,9 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
 #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
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif


@@ -54,6 +51,7 @@
 typedef size_t uintptr_t;
 #endif
 
 typedef size_t uintptr_t;
 #endif
 

+#include <verify.h>

 #include <xalloc.h>
 
 
 #include <xalloc.h>
 
 

diff --git a/src/tables.c b/src/tables.c
index 4e99f4add99911adfa9978401f5d806ce0d2c3cf..02d10f1573d9145f59d8717e62c087b6f3f53207 100644 (file)
--- a/src/tables.c
+++ b/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.  */
   /* 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;
 
 
   nvectors = state_number_as_int (nstates) + nvars;