X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/342b8b6e2156e923797745af2da2596e3086ccd5..5e893e1c884b0d39965d6b694821a36648f1eda1:/src/LR0.c diff --git a/src/LR0.c b/src/LR0.c index 133a8218..6910f3e0 100644 --- a/src/LR0.c +++ b/src/LR0.c @@ -1,5 +1,5 @@ /* Generate the nondeterministic finite state machine for bison, - Copyright 1984, 1986, 1989, 2000 Free Software Foundation, Inc. + Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -23,12 +23,14 @@ The entry point is generate_states. */ #include "system.h" +#include "getargs.h" +#include "reader.h" #include "gram.h" #include "state.h" #include "complain.h" #include "closure.h" #include "LR0.h" - +#include "reduce.h" int nstates; int final_state; @@ -48,7 +50,7 @@ static short *redset = NULL; static short *shiftset = NULL; static short **kernel_base = NULL; -static short **kernel_end = NULL; +static int *kernel_size = NULL; static short *kernel_items = NULL; /* hash table for states, to recognize equivalent ones. */ @@ -60,26 +62,21 @@ static core **state_table = NULL; static void allocate_itemsets (void) { - short *itemp = NULL; - int symbol; 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); - itemp = ritem; - symbol = *itemp++; - while (symbol) - { - if (symbol > 0) - { - count++; - symbol_count[symbol]++; - } - symbol = *itemp++; - } + for (i = 0; ritem[i]; ++i) + if (ritem[i] > 0) + { + count++; + symbol_count[ritem[i]]++; + } /* See comments before new_itemsets. All the vectors of items live inside KERNEL_ITEMS. The number of active items after @@ -98,8 +95,8 @@ allocate_itemsets (void) count += symbol_count[i]; } - shift_symbol = symbol_count; - kernel_end = XCALLOC (short *, nsyms); + free (symbol_count); + kernel_size = XCALLOC (int, nsyms); } @@ -117,13 +114,13 @@ allocate_storage (void) static void free_storage (void) { - XFREE (shift_symbol); - XFREE (redset); - XFREE (shiftset); - XFREE (kernel_base); - XFREE (kernel_end); + free (shift_symbol); + free (redset); + free (shiftset); + free (kernel_base); + free (kernel_size); XFREE (kernel_items); - XFREE (state_table); + free (state_table); } @@ -137,8 +134,7 @@ free_storage (void) | shift_symbol is set to a vector of the symbols that can be | | shifted. For each symbol in the grammar, kernel_base[symbol] | | points to a vector of item numbers activated if that symbol is | -| shifted, and kernel_end[symbol] points after the end of that | -| vector. | +| shifted, and kernel_size[symbol] is their numbers. | `----------------------------------------------------------------*/ static void @@ -146,37 +142,30 @@ new_itemsets (void) { int i; int shiftcount; - short *isp; - short *ksp; - int symbol; -#if TRACE - fprintf (stderr, "Entering new_itemsets\n"); -#endif + if (trace_flag) + fprintf (stderr, "Entering new_itemsets, state = %d\n", + this_state->number); for (i = 0; i < nsyms; i++) - kernel_end[i] = NULL; + kernel_size[i] = 0; + shift_symbol = XCALLOC (short, nsyms); shiftcount = 0; - isp = itemset; - - while (isp < itemsetend) + for (i = 0; i < itemsetsize; ++i) { - i = *isp++; - symbol = ritem[i]; + int symbol = ritem[itemset[i]]; if (symbol > 0) { - ksp = kernel_end[symbol]; - - if (!ksp) + if (!kernel_size[symbol]) { - shift_symbol[shiftcount++] = symbol; - ksp = kernel_base[symbol]; + shift_symbol[shiftcount] = symbol; + shiftcount++; } - *ksp++ = i + 1; - kernel_end[symbol] = ksp; + kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1; + kernel_size[symbol]++; } } @@ -193,36 +182,24 @@ new_itemsets (void) static core * new_state (int symbol) { - int n; core *p; - short *isp1; - short *isp2; - short *iend; -#if TRACE - fprintf (stderr, "Entering new_state, symbol = %d\n", symbol); -#endif + if (trace_flag) + fprintf (stderr, "Entering new_state, state = %d, symbol = %d (%s)\n", + this_state->number, symbol, tags[symbol]); if (nstates >= MAXSHORT) fatal (_("too many states (max %d)"), MAXSHORT); - isp1 = kernel_base[symbol]; - iend = kernel_end[symbol]; - n = iend - isp1; - - p = - (core *) xcalloc ((unsigned) (sizeof (core) + (n - 1) * sizeof (short)), 1); + p = CORE_ALLOC (kernel_size[symbol]); p->accessing_symbol = symbol; p->number = nstates; - p->nitems = n; + p->nitems = kernel_size[symbol]; - isp2 = p->items; - while (isp1 < iend) - *isp2++ = *isp1++; + shortcpy (p->items, kernel_base[symbol], kernel_size[symbol]); last_state->next = p; last_state = p; - nstates++; return p; @@ -232,54 +209,39 @@ new_state (int symbol) /*--------------------------------------------------------------. | Find the state number for the state we would get to (from the | | current state) by shifting symbol. Create a new state if no | -| equivalent one exists already. Used by append_states. | +| equivalent one exists already. Used by append_states. | `--------------------------------------------------------------*/ static int get_state (int symbol) { int key; - short *isp1; - short *isp2; - short *iend; + int i; core *sp; - int found; - int n; + if (trace_flag) + fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n", + this_state->number, symbol, tags[symbol]); -#if TRACE - fprintf (stderr, "Entering get_state, symbol = %d\n", symbol); -#endif - - isp1 = kernel_base[symbol]; - iend = kernel_end[symbol]; - n = iend - isp1; - - /* add up the target state's active item numbers to get a hash key */ + /* Add up the target state's active item numbers to get a hash key. + */ key = 0; - while (isp1 < iend) - key += *isp1++; - + for (i = 0; i < kernel_size[symbol]; ++i) + key += kernel_base[symbol][i]; key = key % STATE_TABLE_SIZE; - sp = state_table[key]; if (sp) { - found = 0; + int found = 0; while (!found) { - if (sp->nitems == n) + if (sp->nitems == kernel_size[symbol]) { found = 1; - isp1 = kernel_base[symbol]; - isp2 = sp->items; - - while (found && isp1 < iend) - { - if (*isp1++ != *isp2++) - found = 0; - } + for (i = 0; i < kernel_size[symbol]; ++i) + if (kernel_base[symbol][i] != sp->items[i]) + found = 0; } if (!found) @@ -301,6 +263,9 @@ get_state (int symbol) state_table[key] = sp = new_state (symbol); } + if (trace_flag) + fprintf (stderr, "Exiting get_state => %d\n", sp->number); + return sp->number; } @@ -318,9 +283,9 @@ append_states (void) int j; int symbol; -#if TRACE - fprintf (stderr, "Entering append_states\n"); -#endif + if (trace_flag) + fprintf (stderr, "Entering append_states, state = %d\n", + this_state->number); /* first sort shift_symbol into increasing order */ @@ -337,55 +302,36 @@ append_states (void) } for (i = 0; i < nshifts; i++) - { - symbol = shift_symbol[i]; - shiftset[i] = get_state (symbol); - } + shiftset[i] = get_state (shift_symbol[i]); } static void new_states (void) { - core *p; - - p = (core *) xcalloc ((unsigned) (sizeof (core) - sizeof (short)), 1); - first_state = last_state = this_state = p; + first_state = last_state = this_state = CORE_ALLOC (0); nstates = 1; } +/*------------------------------------------------------------. +| Save the NSHIFTS of SHIFTSET into the current linked list. | +`------------------------------------------------------------*/ + static void save_shifts (void) { - shifts *p; - short *sp1; - short *sp2; - short *send; - - p = (shifts *) xcalloc ((unsigned) (sizeof (shifts) + - (nshifts - 1) * sizeof (short)), 1); + shifts *p = shifts_new (nshifts); p->number = this_state->number; - p->nshifts = nshifts; - - sp1 = shiftset; - sp2 = p->shifts; - send = shiftset + nshifts; - while (sp1 < send) - *sp2++ = *sp1++; + shortcpy (p->shifts, shiftset, nshifts); if (last_shift) - { - last_shift->next = p; - last_shift = p; - } + last_shift->next = p; else - { - first_shift = p; - last_shift = p; - } + first_shift = p; + last_shift = p; } @@ -400,7 +346,7 @@ insert_start_shift (void) core *statep; shifts *sp; - statep = (core *) xcalloc ((unsigned) (sizeof (core) - sizeof (short)), 1); + statep = CORE_ALLOC (0); statep->number = nstates; statep->accessing_symbol = start_symbol; @@ -408,9 +354,8 @@ insert_start_shift (void) last_state = statep; /* Make a shift from this state to (what will be) the final state. */ - sp = XCALLOC (shifts, 1); + sp = shifts_new (1); sp->number = nstates++; - sp->nshifts = 1; sp->shifts[0] = nstates; last_shift->next = sp; @@ -429,122 +374,110 @@ insert_start_shift (void) static void augment_automaton (void) { - int i; - int k; core *statep; shifts *sp; - shifts *sp2; shifts *sp1 = NULL; sp = first_shift; - if (sp) + if (!sp->nshifts) { - if (sp->number == 0) - { - k = sp->nshifts; - statep = first_state->next; + /* There are no shifts for any state. Make one shift, from the + initial state to the next-to-final state. */ - /* The states reached by shifts from first_state are numbered 1...K. - Look for one reached by start_symbol. */ - while (statep->accessing_symbol < start_symbol - && statep->number < k) - statep = statep->next; + sp = shifts_new (1); + sp->shifts[0] = nstates; - if (statep->accessing_symbol == start_symbol) - { - /* We already have a next-to-final state. - Make sure it has a shift to what will be the final state. */ - k = statep->number; + /* Initialize the chain of shifts with sp. */ + first_shift = sp; + last_shift = sp; - while (sp && sp->number < k) - { - sp1 = sp; - sp = sp->next; - } + /* Create the next-to-final state, with shift to + what will be the final state. */ + insert_start_shift (); + } + else if (sp->number == 0) + { + statep = first_state->next; - if (sp && sp->number == k) - { - sp2 = (shifts *) xcalloc ((unsigned) (sizeof (shifts) - + - sp->nshifts * - sizeof (short)), 1); - sp2->number = k; - sp2->nshifts = sp->nshifts + 1; - sp2->shifts[0] = nstates; - for (i = sp->nshifts; i > 0; i--) - sp2->shifts[i] = sp->shifts[i - 1]; - - /* Patch sp2 into the chain of shifts in place of sp, - following sp1. */ - sp2->next = sp->next; - sp1->next = sp2; - if (sp == last_shift) - last_shift = sp2; - XFREE (sp); - } - else - { - sp2 = XCALLOC (shifts, 1); - sp2->number = k; - sp2->nshifts = 1; - sp2->shifts[0] = nstates; - - /* Patch sp2 into the chain of shifts between sp1 and sp. */ - sp2->next = sp; - sp1->next = sp2; - if (sp == 0) - last_shift = sp2; - } - } - else + /* The states reached by shifts from FIRST_STATE are numbered + 1..(SP->NSHIFTS). Look for one reached by START_SYMBOL. */ + while (statep->accessing_symbol < start_symbol + && statep->number < sp->nshifts) + statep = statep->next; + + if (statep->accessing_symbol == start_symbol) + { + /* We already have a next-to-final state. + Make sure it has a shift to what will be the final state. */ + while (sp && sp->number < statep->number) { - /* There is no next-to-final state as yet. */ - /* Add one more shift in first_shift, - going to the next-to-final state (yet to be made). */ - sp = first_shift; - - sp2 = (shifts *) xcalloc (sizeof (shifts) - + sp->nshifts * sizeof (short), 1); - sp2->nshifts = sp->nshifts + 1; - - /* Stick this shift into the vector at the proper place. */ - statep = first_state->next; - for (k = 0, i = 0; i < sp->nshifts; k++, i++) - { - if (statep->accessing_symbol > start_symbol && i == k) - sp2->shifts[k++] = nstates; - sp2->shifts[k] = sp->shifts[i]; - statep = statep->next; - } - if (i == k) - sp2->shifts[k++] = nstates; + sp1 = sp; + sp = sp->next; + } - /* Patch sp2 into the chain of shifts - in place of sp, at the beginning. */ + if (sp && sp->number == statep->number) + { + int i; + shifts *sp2 = shifts_new (sp->nshifts + 1); + sp2->number = statep->number; + sp2->shifts[0] = nstates; + for (i = sp->nshifts; i > 0; i--) + sp2->shifts[i] = sp->shifts[i - 1]; + + /* Patch sp2 into the chain of shifts in place of sp, + following sp1. */ sp2->next = sp->next; - first_shift = sp2; - if (last_shift == sp) + sp1->next = sp2; + if (sp == last_shift) last_shift = sp2; - XFREE (sp); - - /* Create the next-to-final state, with shift to - what will be the final state. */ - insert_start_shift (); + } + else + { + shifts *sp2 = shifts_new (1); + sp2->number = statep->number; + sp2->shifts[0] = nstates; + + /* Patch sp2 into the chain of shifts between sp1 and sp. */ + sp2->next = sp; + sp1->next = sp2; + if (sp == 0) + last_shift = sp2; } } else { - /* The initial state didn't even have any shifts. - Give it one shift, to the next-to-final state. */ - sp = XCALLOC (shifts, 1); - sp->nshifts = 1; - sp->shifts[0] = nstates; + int i, k; + shifts *sp2; + + /* There is no next-to-final state as yet. */ + /* Add one more shift in first_shift, + going to the next-to-final state (yet to be made). */ + sp = first_shift; + + sp2 = shifts_new (sp->nshifts + 1); + + /* Stick this shift into the vector at the proper place. */ + statep = first_state->next; + for (k = 0, i = 0; i < sp->nshifts; k++, i++) + { + if (statep->accessing_symbol > start_symbol && i == k) + sp2->shifts[k++] = nstates; + sp2->shifts[k] = sp->shifts[i]; + statep = statep->next; + } + if (i == k) + sp2->shifts[k++] = nstates; + + /* Patch sp2 into the chain of shifts + in place of sp, at the beginning. */ + sp2->next = sp->next; + first_shift = sp2; + if (last_shift == sp) + last_shift = sp2; - /* Patch sp into the chain of shifts at the beginning. */ - sp->next = first_shift; - first_shift = sp; + XFREE (sp); /* Create the next-to-final state, with shift to what will be the final state. */ @@ -553,34 +486,31 @@ augment_automaton (void) } else { - /* There are no shifts for any state. - Make one shift, from the initial state to the next-to-final state. */ - - sp = XCALLOC (shifts, 1); - sp->nshifts = 1; + /* The initial state didn't even have any shifts. + Give it one shift, to the next-to-final state. */ + sp = shifts_new (1); sp->shifts[0] = nstates; - /* Initialize the chain of shifts with sp. */ + /* Patch sp into the chain of shifts at the beginning. */ + sp->next = first_shift; first_shift = sp; - last_shift = sp; /* Create the next-to-final state, with shift to - what will be the final state. */ + what will be the final state. */ insert_start_shift (); } /* Make the final state--the one that follows a shift from the next-to-final state. The symbol for that shift is 0 (end-of-file). */ - statep = (core *) xcalloc ((unsigned) (sizeof (core) - sizeof (short)), 1); + statep = CORE_ALLOC (0); statep->number = nstates; last_state->next = statep; last_state = statep; /* Make the shift from the final state to the termination state. */ - sp = XCALLOC (shifts, 1); + sp = shifts_new (1); sp->number = nstates++; - sp->nshifts = 1; sp->shifts[0] = nstates; last_shift->next = sp; last_shift = sp; @@ -590,7 +520,7 @@ augment_automaton (void) final_state = nstates; /* Make the termination state. */ - statep = (core *) xcalloc ((unsigned) (sizeof (core) - sizeof (short)), 1); + statep = CORE_ALLOC (0); statep->number = nstates++; last_state->next = statep; last_state = statep; @@ -606,21 +536,15 @@ augment_automaton (void) static void save_reductions (void) { - short *isp; - short *rp1; - short *rp2; - int item; int count; - reductions *p; - - short *rend; + int i; /* Find and count the active items that represent ends of rules. */ count = 0; - for (isp = itemset; isp < itemsetend; isp++) + for (i = 0; i < itemsetsize; ++i) { - item = ritem[*isp]; + int item = ritem[itemset[i]]; if (item < 0) redset[count++] = -item; } @@ -629,29 +553,18 @@ save_reductions (void) if (count) { - p = (reductions *) xcalloc ((unsigned) (sizeof (reductions) + - (count - 1) * sizeof (short)), 1); + reductions *p = REDUCTIONS_ALLOC (count); p->number = this_state->number; p->nreds = count; - rp1 = redset; - rp2 = p->rules; - rend = rp1 + count; - - for (/* nothing */; rp1 < rend; ++rp1, ++rp2) - *rp2 = *rp1; + shortcpy (p->rules, redset, count); if (last_reduction) - { - last_reduction->next = p; - last_reduction = p; - } + last_reduction->next = p; else - { - first_reduction = p; - last_reduction = p; - } + first_reduction = p; + last_reduction = p; } } @@ -684,8 +597,7 @@ generate_states (void) /* create the shifts structures for the shifts to those states, now that the state numbers transitioning to are known */ - if (nshifts > 0) - save_shifts (); + save_shifts (); /* states are queued when they are created; process them all */ this_state = this_state->next;