* src/muscle_tab.c (muscle_find, muscle_insert): Don't initialize

[bison.git] / src / LR0.c

diff --git a/src/LR0.c b/src/LR0.c
index 72448d735de8915721a9e1241fc992d6af878f3c..efe9589ac946e7f657bf6ba39abec5da42566642 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -52,7 +52,7 @@ static state_t *this_state = NULL;
 static state_t *last_state = NULL;
 
 static int nshifts;
-static token_number_t *shift_symbol = NULL;
+static symbol_number_t *shift_symbol = NULL;
 
 static short *redset = NULL;
 static short *shiftset = NULL;
@@ -117,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 (token_number_t, nsyms);
+  shift_symbol = XCALLOC (symbol_number_t, nsyms);
 }
 
 
@@ -164,8 +164,8 @@ new_itemsets (void)
   for (i = 0; i < nritemset; ++i)
     if (ritem[itemset[i]] >= 0)
       {
-       token_number_t symbol
-         = item_number_as_token_number (ritem[itemset[i]]);
+       symbol_number_t symbol
+         = item_number_as_symbol_number (ritem[itemset[i]]);
        if (!kernel_size[symbol])
          {
            shift_symbol[nshifts] = symbol;
@@ -185,7 +185,7 @@ new_itemsets (void)
 `-----------------------------------------------------------------*/
 
 static state_t *
-new_state (token_number_t symbol, size_t core_size, item_number_t *core)
+new_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
 {
   state_t *p;
 
@@ -200,8 +200,9 @@ new_state (token_number_t symbol, size_t core_size, item_number_t *core)
   p = STATE_ALLOC (core_size);
   p->accessing_symbol = symbol;
   p->number = nstates;
-  p->nitems = core_size;
+  p->solved_conflicts = NULL;
 
+  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
@@ -228,10 +229,10 @@ new_state (token_number_t symbol, size_t core_size, item_number_t *core)
 `--------------------------------------------------------------*/
 
 static int
-get_state (token_number_t symbol, size_t core_size, item_number_t *core)
+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)
@@ -297,7 +298,7 @@ append_states (void)
 {
   int i;
   int j;
-  token_number_t symbol;
+  symbol_number_t symbol;
 
   if (trace_flag)
     fprintf (stderr, "Entering append_states, state = %d\n",