* src/state.h, src/state.c (state_new): New, extracted from...

[bison.git] / src / LR0.c

diff --git a/src/LR0.c b/src/LR0.c
index 95200d53d8b27f1f5869cece72912e4bbd42f17c..8f1df0d34a73bf4622f2b42383b3550f7118ec67 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -37,15 +37,6 @@
 #include "lalr.h"
 #include "reduce.h"
 
-unsigned int nstates = 0;
-/* Initialize the final state to -1, otherwise, it might be set to 0
-   by default, and since we don't compute the reductions of the final
-   state, we end up not computing the reductions of the initial state,
-   which is of course needed.
-
-   FINAL_STATE is properly set by new_state when it recognizes the
-   accessing symbol: EOF.  */
-int final_state = -1;
 static state_t *first_state = NULL;
 
 static state_t *this_state = NULL;
@@ -55,7 +46,7 @@ static int nshifts;
 static symbol_number_t *shift_symbol = NULL;
 
 static short *redset = NULL;
-static short *shiftset = NULL;
+static state_number_t *shiftset = NULL;
 
 static item_number_t **kernel_base = NULL;
 static int *kernel_size = NULL;
@@ -114,7 +105,7 @@ allocate_storage (void)
 {
   allocate_itemsets ();
 
-  shiftset = XCALLOC (short, nsyms);
+  shiftset = XCALLOC (state_number_t, nsyms);
   redset = XCALLOC (short, nrules + 1);
   state_hash = XCALLOC (state_t *, STATE_HASH_SIZE);
   shift_symbol = XCALLOC (symbol_number_t, nsyms);
@@ -187,37 +178,26 @@ new_itemsets (void)
 static state_t *
 new_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
 {
-  state_t *p;
+  state_t *res;
 
   if (trace_flag)
     fprintf (stderr, "Entering new_state, state = %d, symbol = %d (%s)\n",
             nstates, symbol, symbol_tag_get (symbols[symbol]));
 
-  if (nstates >= SHRT_MAX)
-    fatal (_("too many states (max %d)"), SHRT_MAX);
-
-  p = STATE_ALLOC (core_size);
-  p->accessing_symbol = symbol;
-  p->number = nstates;
-  p->solved_conflicts = NULL;
-
-  p->nitems = core_size;
-  memcpy (p->items, core, core_size * sizeof (core[0]));
+  res = state_new (symbol, core_size, core);
 
   /* If this is the eoftoken, and this is not the initial state, then
      this is the final state.  */
   if (symbol == 0 && first_state)
-    final_state = p->number;
+    final_state = res;
 
   if (!first_state)
-    first_state = p;
+    first_state = res;
   if (last_state)
-    last_state->next = p;
-  last_state = p;
-
-  nstates++;
+    last_state->next = res;
+  last_state = res;
 
-  return p;
+  return res;
 }
 
 
@@ -227,7 +207,7 @@ new_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
 | equivalent one exists already.  Used by append_states.        |
 `--------------------------------------------------------------*/
 
-static int
+static state_number_t
 get_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
 {
   int key;
@@ -363,7 +343,7 @@ save_reductions (void)
 
   /* If this is the final state, we want it to have no reductions at
      all, although it has one for `START_SYMBOL EOF .'.  */
-  if (this_state->number == final_state)
+  if (final_state && this_state->number == final_state->number)
     return;
 
   /* Find and count the active items that represent ends of rules. */