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

Because useless nonterminals are now kept alive (instead of being

Browse Source 
`destroyed'), we now sometimes examine them, and store information
related to them.  Hence we need to know their number, and adjust
memory allocations.
* src/reduce.c, src/reduce.h (nuseless_nonterminals): No longer
static.
* src/LR0.c (allocate_itemsets): The memory allocated to
`symbol_count' was used for two different purpose: once to count
the number of occurrences of each symbol, and later reassigned to
`shift_symbol', containing the symbol that can be shifted from a
given state.
Deobfuscate, i.e., allocate, use and free `symbol_count' here
only, and...
(new_itemsets): Allocate `shift_symbol' here.
(allocate_itemsets): symbol_count includes useless nonterminals.
Make room for them.
(free_storage): Use `free', not `XFREE', for pointers that cannot
be null.
This commit is contained in:
Akim Demaille
2001-12-05 09:16:37 +00:00
parent d854cc9e5a
commit fa7f94f217
5 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/LR0.c
View File

@@ -30,7 +30,7 @@
#include "complain.h"
#include "closure.h"
#include "LR0.h"
#include "reduce.h"
int nstates;
int final_state;
@@ -63,11 +63,13 @@ static void
allocate_itemsets (void)
{
int i;
int count;
short *symbol_count = NULL;
count = 0;
symbol_count = XCALLOC (short, nsyms);
/* Count the number of occurrences of all the symbols in RITEMS.
Note that useless productions (hence useless nonterminals) are
browsed too, hence we need to allocate room for _all_ the
symbols. */
int count = 0;
short *symbol_count = XCALLOC (short, nsyms + nuseless_nonterminals);
for (i = 0; ritem[i]; ++i)
if (ritem[i] > 0)
@@ -93,7 +95,7 @@ allocate_itemsets (void)
count += symbol_count[i];
}
shift_symbol = symbol_count;
free (symbol_count);
kernel_size = XCALLOC (int, nsyms);
}
@@ -112,13 +114,13 @@ allocate_storage (void)
static void
free_storage (void)
{
XFREE (shift_symbol);
XFREE (redset);
XFREE (shiftset);
XFREE (kernel_base);
XFREE (kernel_size);
free (shift_symbol);
free (redset);
free (shiftset);
free (kernel_base);
free (kernel_size);
XFREE (kernel_items);
XFREE (state_table);
free (state_table);
}
@@ -148,6 +150,7 @@ new_itemsets (void)
for (i = 0; i < nsyms; i++)
kernel_size[i] = 0;
shift_symbol = XCALLOC (short, nsyms);
shiftcount = 0;
for (i = 0; i < itemsetsize; ++i)