X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5fbb0954b861b5bff653e1b87a1bd5e0b328445d..efea623135d500d3d264f9710983d75435defde7:/src/LR0.c

diff --git a/src/LR0.c b/src/LR0.c
index a2a07881..efe9589a 100644
--- 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)
+new_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
 {
   state_t *p;
 
@@ -197,13 +197,13 @@ new_state (token_number_t symbol)
   if (nstates >= SHRT_MAX)
     fatal (_("too many states (max %d)"), SHRT_MAX);
 
-  p = STATE_ALLOC (kernel_size[symbol]);
+  p = STATE_ALLOC (core_size);
   p->accessing_symbol = symbol;
   p->number = nstates;
-  p->nitems = kernel_size[symbol];
+  p->solved_conflicts = NULL;
 
-  memcpy (p->items, kernel_base[symbol],
-	  kernel_size[symbol] * sizeof (kernel_base[symbol][0]));
+  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
      this is the final state.  */
@@ -229,10 +229,10 @@ new_state (token_number_t symbol)
 `--------------------------------------------------------------*/
 
 static int
-get_state (token_number_t symbol)
+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)
@@ -243,8 +243,8 @@ get_state (token_number_t symbol)
   /* Add up the target state's active item numbers to get a hash key.
      */
   key = 0;
-  for (i = 0; i < kernel_size[symbol]; ++i)
-    key += kernel_base[symbol][i];
+  for (i = 0; i < core_size; ++i)
+    key += core[i];
   key = key % STATE_HASH_SIZE;
   sp = state_hash[key];
 
@@ -253,11 +253,11 @@ get_state (token_number_t symbol)
       int found = 0;
       while (!found)
 	{
-	  if (sp->nitems == kernel_size[symbol])
+	  if (sp->nitems == core_size)
 	    {
 	      found = 1;
-	      for (i = 0; i < kernel_size[symbol]; ++i)
-		if (kernel_base[symbol][i] != sp->items[i])
+	      for (i = 0; i < core_size; ++i)
+		if (core[i] != sp->items[i])
 		  found = 0;
 	    }
 
@@ -269,7 +269,7 @@ get_state (token_number_t symbol)
 		}
 	      else		/* bucket exhausted and no match */
 		{
-		  sp = sp->link = new_state (symbol);
+		  sp = sp->link = new_state (symbol, core_size, core);
 		  found = 1;
 		}
 	    }
@@ -277,7 +277,7 @@ get_state (token_number_t symbol)
     }
   else				/* bucket is empty */
     {
-      state_hash[key] = sp = new_state (symbol);
+      state_hash[key] = sp = new_state (symbol, core_size, core);
     }
 
   if (trace_flag)
@@ -298,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",
@@ -319,7 +319,11 @@ append_states (void)
     }
 
   for (i = 0; i < nshifts; i++)
-    shiftset[i] = get_state (shift_symbol[i]);
+    {
+      symbol = shift_symbol[i];
+      shiftset[i] = get_state (symbol,
+			       kernel_size[symbol], kernel_base[symbol]);
+    }
 }
 
 
@@ -329,7 +333,7 @@ new_states (void)
   /* The 0 at the lhs is the index of the item of this initial rule.  */
   kernel_base[0][0] = 0;
   kernel_size[0] = 1;
-  this_state = new_state (0);
+  this_state = new_state (0, kernel_size[0], kernel_base[0]);
 }