summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel E. Denny <jdenny@clemson.edu>2009-09-03 13:59:07 -0400
committerJoel E. Denny <jdenny@clemson.edu>2009-09-05 18:43:23 -0400
commitc842365a01977bcf69f285116953c54622b19d7c (patch)
tree2067fc6d5ab21ddd283b328fc80bc36fd70af7da
parent14e568d74425e5111429e05fb1036f043b59bed4 (diff)
downloadbison-c842365a01977bcf69f285116953c54622b19d7c.tar.gz
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)
-rw-r--r--ChangeLog8
-rw-r--r--src/output.c3
-rw-r--r--src/system.h5
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f7b0ded9..a8939322 100644
--- 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 2d10a27d..6663a209 100644
--- 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 cc2b09b2..8ea56531 100644
--- 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)
{