X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/38609c34559fb86f2fb827dfed929ba9c396dc6f..baa423bd59767a687ad742adc66a5b7428a41dee:/src/LR0.c diff --git a/src/LR0.c b/src/LR0.c index 4725d6bc..c8f0166b 100644 --- a/src/LR0.c +++ b/src/LR0.c @@ -1,7 +1,7 @@ -/* Generate the nondeterministic finite state machine for Bison. +/* Generate the LR(0) parser states for Bison. - Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2004, 2005, 2006, - 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -26,14 +26,12 @@ #include "system.h" #include -#include #include "LR0.h" #include "closure.h" #include "complain.h" #include "getargs.h" #include "gram.h" -#include "gram.h" #include "lalr.h" #include "reader.h" #include "reduce.h" @@ -63,7 +61,7 @@ state_list_append (symbol_number sym, size_t core_size, item_number *core) if (trace_flag & trace_automaton) fprintf (stderr, "state_list_append (state = %d, symbol = %d (%s))\n", - nstates, sym, symbols[sym]->tag); + nstates, sym, symbols[sym]->tag); node->next = NULL; node->state = s; @@ -101,13 +99,13 @@ allocate_itemsets (void) symbols. */ size_t count = 0; size_t *symbol_count = xcalloc (nsyms + nuseless_nonterminals, - sizeof *symbol_count); + sizeof *symbol_count); for (r = 0; r < nrules; ++r) for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp) { - count++; - symbol_count[*rhsp]++; + count++; + symbol_count[*rhsp]++; } /* See comments before new_itemsets. All the vectors of items @@ -188,15 +186,15 @@ new_itemsets (state *s) for (i = 0; i < nitemset; ++i) if (item_number_is_symbol_number (ritem[itemset[i]])) { - symbol_number sym = item_number_as_symbol_number (ritem[itemset[i]]); - if (!kernel_size[sym]) - { - shift_symbol[nshifts] = sym; - nshifts++; - } - - kernel_base[sym][kernel_size[sym]] = itemset[i] + 1; - kernel_size[sym]++; + symbol_number sym = item_number_as_symbol_number (ritem[itemset[i]]); + if (!kernel_size[sym]) + { + shift_symbol[nshifts] = sym; + nshifts++; + } + + kernel_base[sym][kernel_size[sym]] = itemset[i] + 1; + kernel_size[sym]++; } } @@ -215,7 +213,7 @@ get_state (symbol_number sym, size_t core_size, item_number *core) if (trace_flag & trace_automaton) fprintf (stderr, "Entering get_state, symbol = %d (%s)\n", - sym, symbols[sym]->tag); + sym, symbols[sym]->tag); s = state_hash_lookup (core_size, core); if (!s) @@ -229,7 +227,7 @@ get_state (symbol_number sym, size_t core_size, item_number *core) /*---------------------------------------------------------------. | Use the information computed by new_itemsets to find the state | -| numbers reached by each shift transition from S. | +| numbers reached by each shift transition from S. | | | | SHIFTSET is set up as a vector of those states. | `---------------------------------------------------------------*/ @@ -249,7 +247,7 @@ append_states (state *s) symbol_number sym = shift_symbol[i]; int j; for (j = i; 0 < j && sym < shift_symbol[j - 1]; j--) - shift_symbol[j] = shift_symbol[j - 1]; + shift_symbol[j] = shift_symbol[j - 1]; shift_symbol[j] = sym; } @@ -278,16 +276,16 @@ save_reductions (state *s) { 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; - } - } + { + 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. */ @@ -309,14 +307,14 @@ set_states (void) state_list *this = first_state; /* Pessimization, but simplification of the code: make sure all - the states have valid transitions and reductions members, - even if reduced to 0. It is too soon for errs, which are - computed later, but set_conflicts. */ + the states have valid transitions and reductions members, + even if reduced to 0. It is too soon for errs, which are + computed later, but set_conflicts. */ state *s = this->state; if (!s->transitions) - state_transitions_set (s, 0, 0); + state_transitions_set (s, 0, 0); if (!s->reductions) - state_reductions_set (s, 0, 0); + state_reductions_set (s, 0, 0); states[s->number] = s; @@ -329,8 +327,8 @@ set_states (void) /*-------------------------------------------------------------------. -| Compute the nondeterministic finite state machine (see state.h for | -| details) from the grammar. | +| Compute the LR(0) parser states (see state.h for details) from the | +| grammar. | `-------------------------------------------------------------------*/ void @@ -350,9 +348,9 @@ generate_states (void) { state *s = list->state; if (trace_flag & trace_automaton) - fprintf (stderr, "Processing state %d (reached by %s)\n", - s->number, - symbols[s->accessing_symbol]->tag); + fprintf (stderr, "Processing state %d (reached by %s)\n", + s->number, + symbols[s->accessing_symbol]->tag); /* Set up itemset for the transitions out of this state. itemset gets a vector of all the items that could be accepted next. */ closure (s->items, s->nitems); @@ -364,7 +362,7 @@ generate_states (void) append_states (s); /* Create the shifts structures for the shifts to those states, - now that the state numbers transitioning to are known. */ + now that the state numbers transitioning to are known. */ state_transitions_set (s, nshifts, shiftset); }