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

symtab: refactoring

Browse Source 
Prepares forthcoming changes.

* src/symtab.c (symbols_do): Accept the hash table and the sorted
list as arguments. Adjust dependencies.
This commit is contained in:
Victor Santet
2012-06-20 10:19:04 +02:00
committed by Akim Demaille
parent 9fd33c2b6e
commit dfe292c695
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/symtab.c
View File

@@ -833,20 +833,20 @@ symbols_cmp_qsort (void const *a, void const *b)
} }
static void static void
symbols_do (Hash_processor processor, void *processor_data) symbols_do (Hash_processor processor, void *processor_data,
struct hash_table *table, symbol **sorted)
{ {
size_t count = hash_get_n_entries (symbol_table); size_t count = hash_get_n_entries (table);
if (!symbols_sorted) if (!sorted)
{ {
symbols_sorted = xnmalloc (count, sizeof *symbols_sorted); sorted = xnmalloc (count, sizeof *sorted);
hash_get_entries (symbol_table, (void**)symbols_sorted, count); hash_get_entries (table, (void**)sorted, count);
qsort (symbols_sorted, count, sizeof *symbols_sorted, qsort (sorted, count, sizeof *sorted, symbols_cmp_qsort);
symbols_cmp_qsort);
} }
{ {
size_t i; size_t i;
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
processor (symbols_sorted[i], processor_data); processor (sorted[i], processor_data);
} }
} }
@@ -858,7 +858,8 @@ symbols_do (Hash_processor processor, void *processor_data)
void void
symbols_check_defined (void) symbols_check_defined (void)
{ {
symbols_do (symbol_check_defined_processor, NULL); symbols_do (symbol_check_defined_processor, NULL,
symbol_table, symbols_sorted);
} }
/*------------------------------------------------------------------. /*------------------------------------------------------------------.
@@ -912,7 +913,8 @@ symbols_token_translations_init (void)
number for $undefined, which represents all invalid inputs. */ number for $undefined, which represents all invalid inputs. */
for (i = 0; i < max_user_token_number + 1; i++) for (i = 0; i < max_user_token_number + 1; i++)
token_translations[i] = undeftoken->number; token_translations[i] = undeftoken->number;
symbols_do (symbol_translation_processor, NULL); symbols_do (symbol_translation_processor, NULL,
symbol_table, symbols_sorted);
} }
@@ -924,10 +926,11 @@ symbols_token_translations_init (void)
void void
symbols_pack (void) symbols_pack (void)
{ {
symbols_do (symbol_check_alias_consistency_processor, NULL); symbols_do (symbol_check_alias_consistency_processor, NULL,
symbol_table, symbols_sorted);
symbols = xcalloc (nsyms, sizeof *symbols); symbols = xcalloc (nsyms, sizeof *symbols);
symbols_do (symbol_pack_processor, NULL); symbols_do (symbol_pack_processor, NULL, symbol_table, symbols_sorted);
/* Aliases leave empty slots in symbols, so remove them. */ /* Aliases leave empty slots in symbols, so remove them. */
{ {