mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-11 13:23:04 +00:00
* src/system.h (CALLOC, MALLOC, REALLOC): Remove. All callers
changed to use xcalloc, xnmalloc, xnrealloc, respectively, unless otherwise specified below. * src/LR0.c (allocate_itemsets): Use xnmalloc, not xcalloc, to allocate kernel_base, kernel_items, kernel_size, since they needn't be initialized to 0. (allocate_storgae): Likewise, for shiftset, redset, shift_symbol. * src/closure.c (new_closure): Likewise, for itemset. * src/derives.c (derives_compute): Likewise, for delts, derives, q. * src/lalr.c (set_goto_map): Likewise, for temp_map. (initialize_F): Likewise, for reads, edge, reads[i], includes[i]. (build_relations): Likewise for edge, states1, includes. * src/nullable.c (nullable_compute): Likewise, for squeue, relts. * src/reader.c (packgram): Likewise, for ritem, rules. * src/reduce.c (nonterminals_reduce): Likewise for nontermmap. * src/relation.c (relation_digraph): Likewise for VERTICES. (relation_transpose): Likewise for new_R, end_R. * src/symtab.c (symbols_token_translations_init): Likewise for token_translations. * src/tables.c (save_row): Likewise for froms, tos, conflict_tos. (token_actions): Likewise for yydefact, actrow, conflrow, conflict_list. (save_column): Likewise for froms[symno], tos[symno]. (goto_actions): Likewise for state_count. (pack_table): Likewise for base, pos, check. (tables_generate): Likewise for width. * src/LR0.c (set_states): Don't reuse kernel_size and kernel_base for initial core. Just have a separate core, so we needn't worry about whether kernel_size and kernel_base are initialized. * src/LR0.c (shift_symbol, redset, shiftset, kernel_base, kernel_size, kernel_items): Remove unnecessary initialization. * src/conflicts.c (conflicts): Likewise. * src/derives.c (derives): Likewise. * src/muscle_tablc (muscle_insert): Likewise. * src/relation.c (relation_digraph): Likewise. * src/tables.c (froms, tos, conflict_tos, tally, width, actrow, order, conflrow, conflict_table, conflict_list, table, check): Likewise. * src/closure.c (new_closure): Arg is of type unsigned int, not int. This is because all callers pass unsigned int. * src/closure.h (new_closure): Likewise. * src/lalr.c (initialize_F): Initialize reads[i] in all cases. (build_relations): Initialize includes[i] in all cases. * src/reader.c (packgram): Always initialize rules[ruleno].prec and rules[ruleno].precsym. Initialize members in order. * src/relation.c (relation_transpose): Always initialize new_R[i] and end_R[i]. * src/table.c (conflict_row): Initialize 0 at end of conflict_list. * src/output.c (prepare_actions): Pass 0 instead of conflict_list[0]; conflict_list[0] was always 0, but now it isn't initialized. * src/table.c (table_grow): When conflict_table grew, the grown area wasn't cleared. Fix this.
This commit is contained in:
@@ -98,16 +98,13 @@ relation_digraph (relation r, size_t size, bitsetv *function)
|
||||
unsigned int i;
|
||||
|
||||
infinity = size + 2;
|
||||
CALLOC (INDEX, size + 1);
|
||||
CALLOC (VERTICES, size + 1);
|
||||
INDEX = xcalloc (size + 1, sizeof *INDEX);
|
||||
VERTICES = xnmalloc (size + 1, sizeof *VERTICES);
|
||||
top = 0;
|
||||
|
||||
R = r;
|
||||
F = *function;
|
||||
|
||||
for (i = 0; i < size; i++)
|
||||
INDEX[i] = 0;
|
||||
|
||||
for (i = 0; i < size; i++)
|
||||
if (INDEX[i] == 0 && R[i])
|
||||
traverse (i);
|
||||
@@ -127,11 +124,11 @@ void
|
||||
relation_transpose (relation *R_arg, int n)
|
||||
{
|
||||
/* The result. */
|
||||
relation new_R = CALLOC (new_R, n);
|
||||
relation new_R = xnmalloc (n, sizeof *new_R);
|
||||
/* END_R[I] -- next entry of NEW_R[I]. */
|
||||
relation end_R = CALLOC (end_R, n);
|
||||
relation end_R = xnmalloc (n, sizeof *end_R);
|
||||
/* NEDGES[I] -- total size of NEW_R[I]. */
|
||||
int *nedges = CALLOC (nedges, n);
|
||||
int *nedges = xcalloc (n, sizeof *nedges);
|
||||
int i, j;
|
||||
|
||||
if (trace_flag & trace_sets)
|
||||
@@ -148,13 +145,16 @@ relation_transpose (relation *R_arg, int n)
|
||||
|
||||
/* Allocate. */
|
||||
for (i = 0; i < n; i++)
|
||||
if (nedges[i] > 0)
|
||||
{
|
||||
relation_node *sp = CALLOC (sp, nedges[i] + 1);
|
||||
sp[nedges[i]] = END_NODE;
|
||||
new_R[i] = sp;
|
||||
end_R[i] = sp;
|
||||
}
|
||||
{
|
||||
relation_node *sp = NULL;
|
||||
if (nedges[i] > 0)
|
||||
{
|
||||
sp = xnmalloc (nedges[i] + 1, sizeof *sp);
|
||||
sp[nedges[i]] = END_NODE;
|
||||
}
|
||||
new_R[i] = sp;
|
||||
end_R[i] = sp;
|
||||
}
|
||||
|
||||
/* Store. */
|
||||
for (i = 0; i < n; i++)
|
||||
|
||||
Reference in New Issue
Block a user