X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/779e7ceb9395424c2cf90d43c75302ababc8ee72..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/src/LR0.c diff --git a/src/LR0.c b/src/LR0.c index 2a75193e..945d41f8 100644 --- a/src/LR0.c +++ b/src/LR0.c @@ -1,7 +1,7 @@ /* Generate the nondeterministic finite state machine for Bison. - Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2004 Free - Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2004, 2005, 2006 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -17,13 +17,14 @@ You should have received a copy of the GNU General Public License along with Bison; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* See comments in state.h for the data structures that represent it. The entry point is generate_states. */ +#include #include "system.h" #include @@ -59,18 +60,13 @@ static state_list *last_state = NULL; static state * state_list_append (symbol_number sym, size_t core_size, item_number *core) { - state_list *node = MALLOC (node, 1); + state_list *node = xmalloc (sizeof *node); state *s = state_new (sym, core_size, core); if (trace_flag & trace_automaton) fprintf (stderr, "state_list_append (state = %d, symbol = %d (%s))\n", nstates, sym, symbols[sym]->tag); - /* If this is the endtoken, and this is not the initial state, then - this is the final state. */ - if (sym == 0 && first_state) - final_state = s; - node->next = NULL; node->state = s; @@ -84,14 +80,14 @@ state_list_append (symbol_number sym, size_t core_size, item_number *core) } static int nshifts; -static symbol_number *shift_symbol = NULL; +static symbol_number *shift_symbol; -static rule **redset = NULL; -static state **shiftset = NULL; +static rule **redset; +static state **shiftset; -static item_number **kernel_base = NULL; -static int *kernel_size = NULL; -static item_number *kernel_items = NULL; +static item_number **kernel_base; +static int *kernel_size; +static item_number *kernel_items; static void @@ -105,9 +101,9 @@ allocate_itemsets (void) Note that useless productions (hence useless nonterminals) are browsed too, hence we need to allocate room for _all_ the symbols. */ - int count = 0; - short int *symbol_count = CALLOC (symbol_count, - nsyms + nuseless_nonterminals); + size_t count = 0; + size_t *symbol_count = xcalloc (nsyms + nuseless_nonterminals, + sizeof *symbol_count); for (r = 0; r < nrules; ++r) for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp) @@ -122,9 +118,8 @@ allocate_itemsets (void) appears as an item, which is SYMBOL_COUNT[S]. We allocate that much space for each symbol. */ - CALLOC (kernel_base, nsyms); - if (count) - CALLOC (kernel_items, count); + kernel_base = xnmalloc (nsyms, sizeof *kernel_base); + kernel_items = xnmalloc (count, sizeof *kernel_items); count = 0; for (i = 0; i < nsyms; i++) @@ -134,7 +129,7 @@ allocate_itemsets (void) } free (symbol_count); - CALLOC (kernel_size, nsyms); + kernel_size = xnmalloc (nsyms, sizeof *kernel_size); } @@ -143,10 +138,10 @@ allocate_storage (void) { allocate_itemsets (); - CALLOC (shiftset, nsyms); - CALLOC (redset, nrules); + shiftset = xnmalloc (nsyms, sizeof *shiftset); + redset = xnmalloc (nrules, sizeof *redset); state_hash_new (); - CALLOC (shift_symbol, nsyms); + shift_symbol = xnmalloc (nsyms, sizeof *shift_symbol); } @@ -158,7 +153,7 @@ free_storage (void) free (shiftset); free (kernel_base); free (kernel_size); - XFREE (kernel_items); + free (kernel_items); state_hash_free (); } @@ -179,13 +174,12 @@ free_storage (void) static void new_itemsets (state *s) { - int i; + size_t i; if (trace_flag & trace_automaton) fprintf (stderr, "Entering new_itemsets, state = %d\n", s->number); - for (i = 0; i < nsyms; i++) - kernel_size[i] = 0; + memset (kernel_size, 0, nsyms * sizeof *kernel_size); nshifts = 0; @@ -215,20 +209,20 @@ new_itemsets (state *s) static state * get_state (symbol_number sym, size_t core_size, item_number *core) { - state *sp; + state *s; if (trace_flag & trace_automaton) fprintf (stderr, "Entering get_state, symbol = %d (%s)\n", sym, symbols[sym]->tag); - sp = state_hash_lookup (core_size, core); - if (!sp) - sp = state_list_append (sym, core_size, core); + s = state_hash_lookup (core_size, core); + if (!s) + s = state_list_append (sym, core_size, core); if (trace_flag & trace_automaton) - fprintf (stderr, "Exiting get_state => %d\n", sp->number); + fprintf (stderr, "Exiting get_state => %d\n", s->number); - return sp; + return s; } /*---------------------------------------------------------------. @@ -252,7 +246,7 @@ append_states (state *s) { symbol_number sym = shift_symbol[i]; int j; - for (j = i; 0 < j && sym < shift_symbol [j - 1]; j--) + for (j = i; 0 < j && sym < shift_symbol[j - 1]; j--) shift_symbol[j] = shift_symbol[j - 1]; shift_symbol[j] = sym; } @@ -275,14 +269,23 @@ static void save_reductions (state *s) { int count = 0; - int i; + size_t i; /* Find and count the active items that represent ends of rules. */ for (i = 0; i < nritemset; ++i) { - int item = ritem[itemset[i]]; - if (item < 0) - redset[count++] = &rules[item_number_as_rule_number (item)]; + item_number item = ritem[itemset[i]]; + if (item_number_is_rule_number (item)) + { + rule_number r = item_number_as_rule_number (item); + redset[count++] = &rules[r]; + if (r == 0) + { + /* This is "reduce 0", i.e., accept. */ + aver (!final_state); + final_state = s; + } + } } /* Make a reductions structure and copy the data into it. */ @@ -297,7 +300,7 @@ save_reductions (state *s) static void set_states (void) { - CALLOC (states, nstates); + states = xcalloc (nstates, sizeof *states); while (first_state) { @@ -331,19 +334,17 @@ set_states (void) void generate_states (void) { + item_number initial_core = 0; state_list *list = NULL; allocate_storage (); new_closure (nritems); /* Create the initial state. The 0 at the lhs is the index of the item of this initial rule. */ - kernel_base[0][0] = 0; - kernel_size[0] = 1; - state_list_append (0, kernel_size[0], kernel_base[0]); + state_list_append (0, 1, &initial_core); - list = first_state; - - while (list) + /* States are queued when they are created; process them all. */ + for (list = first_state; list; list = list->next) { state *s = list->state; if (trace_flag & trace_automaton) @@ -365,10 +366,6 @@ generate_states (void) /* Create the shifts structures for the shifts to those states, now that the state numbers transitioning to are known. */ state_transitions_set (s, nshifts, shiftset); - - /* states are queued when they are created; process them all. - */ - list = list->next; } /* discard various storage */