X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5123689ba05a181aedd892e2e2164a2288e42b22..da4160c30ae623f732447afa85ea08984abc2315:/src/LR0.c diff --git a/src/LR0.c b/src/LR0.c index 2fa64c5e..efe9589a 100644 --- a/src/LR0.c +++ b/src/LR0.c @@ -26,6 +26,7 @@ #include "bitset.h" #include "quotearg.h" #include "symtab.h" +#include "gram.h" #include "getargs.h" #include "reader.h" #include "gram.h" @@ -51,14 +52,14 @@ static state_t *this_state = NULL; static state_t *last_state = NULL; static int nshifts; -static short *shift_symbol = NULL; +static symbol_number_t *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 +71,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 +93,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++) @@ -116,7 +117,7 @@ allocate_storage (void) shiftset = XCALLOC (short, nsyms); redset = XCALLOC (short, nrules + 1); state_hash = XCALLOC (state_t *, STATE_HASH_SIZE); - shift_symbol = XCALLOC (short, nsyms); + shift_symbol = XCALLOC (symbol_number_t, nsyms); } @@ -161,20 +162,19 @@ new_itemsets (void) nshifts = 0; for (i = 0; i < nritemset; ++i) - { - int symbol = ritem[itemset[i]]; - if (symbol >= 0) - { - if (!kernel_size[symbol]) - { - shift_symbol[nshifts] = symbol; - nshifts++; - } - - kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1; - kernel_size[symbol]++; - } - } + if (ritem[itemset[i]] >= 0) + { + symbol_number_t symbol + = item_number_as_symbol_number (ritem[itemset[i]]); + if (!kernel_size[symbol]) + { + shift_symbol[nshifts] = symbol; + nshifts++; + } + + kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1; + kernel_size[symbol]++; + } } @@ -185,7 +185,7 @@ new_itemsets (void) `-----------------------------------------------------------------*/ static state_t * -new_state (int symbol) +new_state (symbol_number_t symbol, size_t core_size, item_number_t *core) { state_t *p; @@ -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 = STATE_ALLOC (core_size); p->accessing_symbol = symbol; p->number = nstates; - p->nitems = kernel_size[symbol]; + p->solved_conflicts = NULL; - shortcpy (p->items, kernel_base[symbol], kernel_size[symbol]); + p->nitems = core_size; + memcpy (p->items, core, core_size * sizeof (core[0])); /* If this is the eoftoken, and this is not the initial state, then this is the final state. */ @@ -228,10 +229,10 @@ new_state (int symbol) `--------------------------------------------------------------*/ static int -get_state (int symbol) +get_state (symbol_number_t symbol, size_t core_size, item_number_t *core) { int key; - int i; + size_t i; state_t *sp; if (trace_flag) @@ -242,8 +243,8 @@ get_state (int symbol) /* Add up the target state's active item numbers to get a hash key. */ key = 0; - for (i = 0; i < kernel_size[symbol]; ++i) - key += kernel_base[symbol][i]; + for (i = 0; i < core_size; ++i) + key += core[i]; key = key % STATE_HASH_SIZE; sp = state_hash[key]; @@ -252,11 +253,11 @@ get_state (int symbol) int found = 0; while (!found) { - if (sp->nitems == kernel_size[symbol]) + if (sp->nitems == core_size) { found = 1; - for (i = 0; i < kernel_size[symbol]; ++i) - if (kernel_base[symbol][i] != sp->items[i]) + for (i = 0; i < core_size; ++i) + if (core[i] != sp->items[i]) found = 0; } @@ -268,7 +269,7 @@ get_state (int symbol) } else /* bucket exhausted and no match */ { - sp = sp->link = new_state (symbol); + sp = sp->link = new_state (symbol, core_size, core); found = 1; } } @@ -276,7 +277,7 @@ get_state (int symbol) } else /* bucket is empty */ { - state_hash[key] = sp = new_state (symbol); + state_hash[key] = sp = new_state (symbol, core_size, core); } if (trace_flag) @@ -297,7 +298,7 @@ append_states (void) { int i; int j; - int symbol; + symbol_number_t symbol; if (trace_flag) fprintf (stderr, "Entering append_states, state = %d\n", @@ -318,7 +319,11 @@ append_states (void) } for (i = 0; i < nshifts; i++) - shiftset[i] = get_state (shift_symbol[i]); + { + symbol = shift_symbol[i]; + shiftset[i] = get_state (symbol, + kernel_size[symbol], kernel_base[symbol]); + } } @@ -328,7 +333,7 @@ new_states (void) /* The 0 at the lhs is the index of the item of this initial rule. */ kernel_base[0][0] = 0; kernel_size[0] = 1; - this_state = new_state (0); + this_state = new_state (0, kernel_size[0], kernel_base[0]); } @@ -340,7 +345,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 +377,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])); }