Use aver not assert.

* src/output.c: Don't include assert.h.
(output_skeleton): Use aver not assert.
* src/system.h (aver): In documentation of why, add links to
Paul Eggert's explanations in the mailing lists.
(cherry picked from commit 9789acf09124eb5ffbe5f0737261aec91b32ebd4)

diff --git a/ChangeLog b/ChangeLog
index f7b0ded99d3a5d3686b1218825ad2b87e878bb42..a89393222b96313bc4dcb0c572caf2674646a5cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-03  Joel E. Denny  <jdenny@clemson.edu>
+
+       Use aver not assert.
+       * src/output.c: Don't include assert.h.
+       (output_skeleton): Use aver not assert.
+       * src/system.h (aver): In documentation of why, add links to
+       Paul Eggert's explanations in the mailing lists.
+
 2009-09-05  Alex Rozenman  <rozenman@gmail.com>
 
        Use "Unresolved reference" error message when no symbols were found

diff --git a/src/output.c b/src/output.c
index 2d10a27db21efb99178daff98e86b80285277007..6663a209d0271f972f9bbbf54edd77f6f6c57a69 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #include "system.h"
 
-#include <assert.h>
 #include <configmake.h>
 #include <error.h>
 #include <get-errno.h>
@@ -566,7 +565,7 @@ output_skeleton (void)
     argv[i++] = full_m4bison;
     argv[i++] = full_skeleton;
     argv[i++] = NULL;
-    assert (i <= ARRAY_CARDINALITY (argv));
+    aver (i <= ARRAY_CARDINALITY (argv));
   }
 
   init_subpipe ();

diff --git a/src/system.h b/src/system.h
index cc2b09b22d14c280b58e2b18749f5cfd18c34188..8ea5653157fdc72feca09a0324b78b9ae0481f4c 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -124,7 +124,10 @@ typedef size_t uintptr_t;
 `-------------*/
 
 /* <assert.h>'s assertions are too heavyweight, and can be disabled
-   too easily, so use aver rather than assert.  */
+   too easily, so use aver rather than assert.  See discussions at
+   <http://lists.gnu.org/archive/html/bison-patches/2006-01/msg00080.html>
+   <http://lists.gnu.org/archive/html/bison-patches/2006-09/msg00111.html>.
+*/
 static inline void
 aver (bool assertion)
 {