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

* src/gram.h (item_number_t): New, the type of item numbers in

Browse Source 
RITEM.  Note that it must be able to code symbol numbers as
positive number, and the negation of rule numbers as negative
numbers.
Adjust all dependencies (pretty many).
* src/reduce.c (rule): Remove this `short *' pointer: use
item_number_t.
* src/system.h (MINSHORT, MAXSHORT): Remove.
Include `limits.h'.
Adjust dependencies to using SHRT_MAX and SHRT_MIN.
(shortcpy): Remove.
(MAXTABLE): Move to...
* src/output.c (MAXTABLE): here.
(prepare_rules): Use output_int_table to output rhs.
* data/bison.simple, data/bison.c++: Adjust.
* tests/torture.at (Big triangle): Move the limit from 254 to
500.
* tests/regression.at (Web2c Actions): Ajust.
Trying with bigger grammars shows various phenomena: at 3000 (28Mb
of grammar file) bison is killed by my system, at 2000 (12Mb) bison
passes, but produces negative #line number, once fixed, GCC is
killed while compiling 14Mb, at 1500 (6.7 Mb of grammar, 8.2Mb of
C), it passes.
* src/state.h (state_h): Code input lines on ints, not shorts.
This commit is contained in:
Akim Demaille
2002-04-08 11:46:26 +00:00
parent 355e7c1cd1
commit 62a3e4f0c5
24 changed files with 269 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/LR0.c
View File

@@ -56,9 +56,9 @@ static short *shift_symbol = NULL;
static short *redset = NULL;
static short *shiftset = NULL;
static short **kernel_base = NULL;
static item_number_t **kernel_base = NULL;
static int *kernel_size = NULL;
static short *kernel_items = NULL;
static item_number_t *kernel_items = NULL;
/* hash table for states, to recognize equivalent ones. */
@@ -70,7 +70,7 @@ static void
allocate_itemsets (void)
{
int i, r;
short *rhsp;
item_number_t *rhsp;
/* Count the number of occurrences of all the symbols in RITEMS.
Note that useless productions (hence useless nonterminals) are
@@ -92,9 +92,9 @@ allocate_itemsets (void)
appears as an item, which is symbol_count[symbol].
We allocate that much space for each symbol. */
kernel_base = XCALLOC (short *, nsyms);
kernel_base = XCALLOC (item_number_t *, nsyms);
if (count)
kernel_items = XCALLOC (short, count);
kernel_items = XCALLOC (item_number_t, count);
count = 0;
for (i = 0; i < nsyms; i++)
@@ -194,15 +194,16 @@ new_state (int symbol)
nstates, symbol, quotearg_style (escape_quoting_style,
symbols[symbol]->tag));
if (nstates >= MAXSHORT)
fatal (_("too many states (max %d)"), MAXSHORT);
if (nstates >= SHRT_MAX)
fatal (_("too many states (max %d)"), SHRT_MAX);
p = STATE_ALLOC (kernel_size[symbol]);
p->accessing_symbol = symbol;
p->number = nstates;
p->nitems = kernel_size[symbol];
shortcpy (p->items, kernel_base[symbol], kernel_size[symbol]);
memcpy (p->items, kernel_base[symbol],
kernel_size[symbol] * sizeof (kernel_base[symbol][0]));
/* If this is the eoftoken, and this is not the initial state, then
this is the final state. */
@@ -340,7 +341,7 @@ static void
save_shifts (void)
{
shifts *p = shifts_new (nshifts);
shortcpy (p->shifts, shiftset, nshifts);
memcpy (p->shifts, shiftset, nshifts * sizeof (shiftset[0]));
this_state->shifts = p;
}
@@ -372,7 +373,7 @@ save_reductions (void)
/* Make a reductions structure and copy the data into it. */
this_state->reductions = reductions_new (count);
shortcpy (this_state->reductions->rules, redset, count);
memcpy (this_state->reductions->rules, redset, count * sizeof (redset[0]));
}