mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-12 13:53:03 +00:00
Be a bit more systematic about using 'abort'.
* lib/abitset.c (abitset_test): Remove ATTRIBUTE_UNUSED; not needed. * lib/bitset.c (bitset_bytes, bitset_init, bitset_op4_cmp): Put 'default: abort ();' before some other case, to satisfy older pedantic compilers. * lib/bitset_stats.c (bitset_stats_init): Likewise. * lib/ebitset.c (ebitset_elt_find, ebitset_op3_cmp): Likewise. * lib/lbitset.c (lbitset_elt_find, lbitset_op3_cmp): Likewise. * src/conflicts.c (resolve_sr_conflict): Likewise. * src/vcg.c (get_color_str, get_textmode_str, get_shape_str): (get_decision_str, get_orientation_str, get_node_alignment_str): (get_arrow_mode_str, get_crossing_type_str, get_view_str): (get_linestyle_str, get_arrowstyle_str): Likewise. * src/conflicts.c (resolve_sr_conflict): Use a default case rather than one for the one remaining enum value, to catch invalid enum values as well. * src/lalr.c (set_goto_map, map_goto): Prefer "assert (FOO);" to "if (!FOO) abort ();". * src/nullable.c (nullable_compute, token_definitions_output): Likewise. * src/reader.c (packgram, reader): Likewise. * src/state.c (transitions_to, state_new, 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/scan-skel.l (QPUTS): Remove unnecessary parens. (BASE_QPUTS, "@output ".*\n): Remove unnecessary asserts. * src/system.h: Don't include <assert.h>. (assert): New macro.
This commit is contained in:
@@ -61,8 +61,7 @@ transitions_to (transitions *shifts, symbol_number sym)
|
||||
int j;
|
||||
for (j = 0; ; j++)
|
||||
{
|
||||
if (shifts->num <= j)
|
||||
abort ();
|
||||
assert (j < shifts->num);
|
||||
if (TRANSITION_SYMBOL (shifts, j) == sym)
|
||||
return shifts->states[j];
|
||||
}
|
||||
@@ -136,8 +135,7 @@ state_new (symbol_number accessing_symbol,
|
||||
state *res;
|
||||
size_t items_size = nitems * sizeof *core;
|
||||
|
||||
if (STATE_NUMBER_MAXIMUM <= nstates)
|
||||
abort ();
|
||||
assert (nstates < STATE_NUMBER_MAXIMUM);
|
||||
|
||||
res = xmalloc (offsetof (state, items) + items_size);
|
||||
res->number = nstates++;
|
||||
@@ -214,8 +212,7 @@ state_reduction_find (state *s, rule *r)
|
||||
void
|
||||
state_errs_set (state *s, int num, symbol **tokens)
|
||||
{
|
||||
if (s->errs)
|
||||
abort ();
|
||||
assert (!s->errs);
|
||||
s->errs = errs_new (num, tokens);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user