Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

cex: be sure to always reclaim memory put in hashes

Browse Source 
One call to hash_initialize did not provide a function to free memory.

* src/state-item.c (hash_pair_table_create): New.
Use it.
This commit is contained in:
Akim Demaille
2020-05-17 17:22:29 +02:00
parent 193dc86965
commit e8619330e8
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/state-item.c
View File

@@ -65,6 +65,16 @@ hash_pair_free (hash_pair *hp)
free (hp); free (hp);
} }
Hash_table *
hash_pair_table_create (int size)
{
return hash_xinitialize (size,
NULL,
(Hash_hasher) hash_pair_hasher,
(Hash_comparator) hash_pair_comparator,
(Hash_data_freer) hash_pair_free);
}
static bitset static bitset
hash_pair_lookup (Hash_table *tab, int key) hash_pair_lookup (Hash_table *tab, int key)
{ {
@@ -208,8 +218,8 @@ init_trans (void)
state *s = states[i]; state *s = states[i];
transitions *t = s->transitions; transitions *t = s->transitions;
Hash_table *transition_set Hash_table *transition_set
= hash_initialize (t->num, NULL, (Hash_hasher) state_sym_hasher, = hash_xinitialize (t->num, NULL, (Hash_hasher) state_sym_hasher,
(Hash_comparator) state_sym_comparator, NULL); (Hash_comparator) state_sym_comparator, NULL);
for (int j = 0; j < t->num; ++j) for (int j = 0; j < t->num; ++j)
if (!TRANSITION_IS_DISABLED (t, j)) if (!TRANSITION_IS_DISABLED (t, j))
hash_xinsert (transition_set, t->states[j]); hash_xinsert (transition_set, t->states[j]);
@@ -249,21 +259,13 @@ si_prods_lookup (state_item_number si)
static void static void
init_prods (void) init_prods (void)
{ {
si_prods = hash_initialize (nstate_items, si_prods = hash_pair_table_create (nstate_items);
NULL,
(Hash_hasher) hash_pair_hasher,
(Hash_comparator) hash_pair_comparator,
(Hash_data_freer) hash_pair_free);
for (int i = 0; i < nstates; ++i) for (int i = 0; i < nstates; ++i)
{ {
state *s = states[i]; state *s = states[i];
// closure_map is a hash map from nonterminals to a set // closure_map is a hash map from nonterminals to a set
// of the items that produce those nonterminals // of the items that produce those nonterminals
Hash_table *closure_map Hash_table *closure_map = hash_pair_table_create (nsyms - ntokens);
= hash_initialize (nsyms - ntokens, NULL,
(Hash_hasher) hash_pair_hasher,
(Hash_comparator) hash_pair_comparator,
NULL);
// Add the nitems of state to skip to the production portion // Add the nitems of state to skip to the production portion
// of that state's state_items // of that state's state_items
@@ -379,8 +381,7 @@ init_firsts (void)
symbol_number lhs = r->lhs->number; symbol_number lhs = r->lhs->number;
bitset f_lhs = FIRSTS (lhs); bitset f_lhs = FIRSTS (lhs);
for (item_number *n = r->rhs; for (item_number *n = r->rhs;
item_number_is_symbol_number (*n) && item_number_is_symbol_number (*n) && ISVAR (*n);
ISVAR (*n);
++n) ++n)
{ {
bitset f = FIRSTS (*n); bitset f = FIRSTS (*n);