* lib/argmatch.c, lib/argmatch.h: Sync with gnulib.

Avoid use of <assert.h>, as the GNU Coding Standards hint that one
should use `if (! x) abort ();' rather than `assert (x);', and
anyway it's one less thing to worry about configuring.

diff --git a/ChangeLog b/ChangeLog
index 422caf3900038389a4ed9b821bc512aee15a9ce7..02b3bcfbddc399f7e706c1cb5567f3cc51fab83e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2002-11-20  Paul Eggert  <eggert@twinsun.com>
+
+       * lib/argmatch.c, lib/argmatch.h: Sync with gnulib.
+
+2002-11-20  Paul Eggert  <eggert@twinsun.com>
+       
+       Avoid use of <assert.h>, as the GNU Coding Standards hint that one
+       should use `if (! x) abort ();' rather than `assert (x);', and
+       anyway it's one less thing to worry about configuring.
+
+       * data/glr.c, lib/hash.c, src/system.h: Do not include <assert.h>.
+       * tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): Likewise,
+       and replace all instances of assert with abort.
+       * tests/calc.at (_AT_DATA_CALC_Y): Likewise.
+       * tests/cxx-type.at (_AT_TEST_GLR_CXXTYPES): Likewise.
+
+       * data/glr.c (yydoAction, yyglrReduce, yysplitStack, yyresolveStates,
+       yyresolveAction, yyprocessOneStack): Use abort rather than assert.
+       * lib/hash.c (hash_lookup, hash_get_first, hash_get_next,
+       hash_find_entry, hash_rehash, hash_insert): Likewise.
+       * src/conflicts.c (resolve_sr_conflict): Likewise.
+       * src/lalr.c (set_goto_map, map_goto): Likewise.
+       * src/nullable.c (nullable_compute): Likewise.
+       * src/output.c (prepare_rules, token_definitions_output): Likewise.
+       * src/reader.c (packgram, reader): Likewise.
+       * src/state.c (state_new, state_free, state_transitions_set,
+       state_reduction_find): Likewise.
+       * src/symtab.c (symbol_user_token_number_set, symbol_make_alias,
+       symbol_pack): Likewise.
+       * src/tables.c (conflict_row, pack_vector): Likewise.
+       * src/vcg.c (get_color_str, get_textmode_str, get_shape_str,
+       get_layoutalgorithm_str, get_decision_str, get_orientation_str,
+       get_node_alignement_str, get_arrow_mode_str, get_crossing_type_str,
+       get_view_str, get_linestyle_str, get_arrowstyle_str): Likewise.
+
+       * lib/argmatch.h (ARRAY_CARDINALITY): Do not bother to #undef.
+       (ARGMATCH_CONSTRAINT): New macro.
+       (ARGMATCH_ASSERT): Use it.
+
+       * src/system.h (verify): New macro.
+       * src/getargs.c (trace_argmatch, report_argmatch): Use verify
+       rather than assert.
+       * src/tables.c (tables_generate): Likewise.
+
+       * src/struniq.c (struniq_assert): Now returns void, and aborts
+       if the assertion is false.
+       (struniq_assert_p): Remove.
+       * src/struniq.h: Likewise.
+
 2002-11-18  Paul Eggert  <eggert@twinsun.com>
 
        * data/glr.c (yygetLRActions): Replace `yyindex' with