X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9bfe901c33190b9726bddabf8f192ad0c3a25500..eeeb962b:/src/LR0.c

diff --git a/src/LR0.c b/src/LR0.c
index 3760a988..06ee51f6 100644
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -24,6 +24,7 @@
 
 #include "system.h"
 #include "getargs.h"
+#include "reader.h"
 #include "gram.h"
 #include "state.h"
 #include "complain.h"
@@ -49,7 +50,7 @@ static short *redset = NULL;
 static short *shiftset = NULL;
 
 static short **kernel_base = NULL;
-static short **kernel_end = NULL;
+static int *kernel_size = NULL;
 static short *kernel_items = NULL;
 
 /* hash table for states, to recognize equivalent ones.  */
@@ -61,8 +62,6 @@ static core **state_table = NULL;
 static void
 allocate_itemsets (void)
 {
-  short *itemp = NULL;
-  int symbol;
   int i;
   int count;
   short *symbol_count = NULL;
@@ -70,17 +69,12 @@ allocate_itemsets (void)
   count = 0;
   symbol_count = XCALLOC (short, nsyms);
 
-  itemp = ritem;
-  symbol = *itemp++;
-  while (symbol)
-    {
-      if (symbol > 0)
-	{
-	  count++;
-	  symbol_count[symbol]++;
-	}
-      symbol = *itemp++;
-    }
+  for (i = 0; ritem[i]; ++i)
+    if (ritem[i] > 0)
+      {
+	count++;
+	symbol_count[ritem[i]]++;
+      }
 
   /* See comments before new_itemsets.  All the vectors of items
      live inside KERNEL_ITEMS.  The number of active items after
@@ -100,7 +94,7 @@ allocate_itemsets (void)
     }
 
   shift_symbol = symbol_count;
-  kernel_end = XCALLOC (short *, nsyms);
+  kernel_size = XCALLOC (int, nsyms);
 }
 
 
@@ -122,7 +116,7 @@ free_storage (void)
   XFREE (redset);
   XFREE (shiftset);
   XFREE (kernel_base);
-  XFREE (kernel_end);
+  XFREE (kernel_size);
   XFREE (kernel_items);
   XFREE (state_table);
 }
@@ -138,8 +132,7 @@ free_storage (void)
 | shift_symbol is set to a vector of the symbols that can be      |
 | shifted.  For each symbol in the grammar, kernel_base[symbol]   |
 | points to a vector of item numbers activated if that symbol is  |
-| shifted, and kernel_end[symbol] points after the end of that    |
-| vector.                                                         |
+| shifted, and kernel_size[symbol] is their numbers.              |
 `----------------------------------------------------------------*/
 
 static void
@@ -149,29 +142,27 @@ new_itemsets (void)
   int shiftcount;
 
   if (trace_flag)
-    fprintf (stderr, "Entering new_itemsets, state = %d\n", nstates);
+    fprintf (stderr, "Entering new_itemsets, state = %d\n",
+	     this_state->number);
 
   for (i = 0; i < nsyms; i++)
-    kernel_end[i] = NULL;
+    kernel_size[i] = 0;
 
   shiftcount = 0;
 
-  for (i = 0; i < itemsetend - itemset; ++i)
+  for (i = 0; i < itemsetsize; ++i)
     {
       int symbol = ritem[itemset[i]];
       if (symbol > 0)
 	{
-	  short *ksp = kernel_end[symbol];
-
-	  if (!ksp)
+	  if (!kernel_size[symbol])
 	    {
 	      shift_symbol[shiftcount] = symbol;
-	      ksp = kernel_base[symbol];
 	      shiftcount++;
 	    }
 
-	  *ksp++ = itemset[i] + 1;
-	  kernel_end[symbol] = ksp;
+	  kernel_base[symbol][kernel_size[symbol]] = itemset[i] + 1;
+	  kernel_size[symbol]++;
 	}
     }
 
@@ -188,24 +179,21 @@ new_itemsets (void)
 static core *
 new_state (int symbol)
 {
-  int n;
   core *p;
 
   if (trace_flag)
-    fprintf (stderr, "Entering new_state, state = %d, symbol = %d\n",
-	     nstates, symbol);
+    fprintf (stderr, "Entering new_state, state = %d, symbol = %d (%s)\n",
+	     this_state->number, symbol, tags[symbol]);
 
   if (nstates >= MAXSHORT)
     fatal (_("too many states (max %d)"), MAXSHORT);
 
-  n = kernel_end[symbol] - kernel_base[symbol];
-
-  p = CORE_ALLOC (n);
+  p = CORE_ALLOC (kernel_size[symbol]);
   p->accessing_symbol = symbol;
   p->number = nstates;
-  p->nitems = n;
+  p->nitems = kernel_size[symbol];
 
-  shortcpy (p->items, kernel_base[symbol], n);
+  shortcpy (p->items, kernel_base[symbol], kernel_size[symbol]);
 
   last_state->next = p;
   last_state = p;
@@ -225,20 +213,17 @@ static int
 get_state (int symbol)
 {
   int key;
-  short *isp2;
   int i;
   core *sp;
 
-  int n = kernel_end[symbol] - kernel_base[symbol];
-
   if (trace_flag)
-    fprintf (stderr, "Entering get_state, state = %d, symbol = %d\n",
-	     nstates, symbol);
+    fprintf (stderr, "Entering get_state, state = %d, symbol = %d (%s)\n",
+	     this_state->number, symbol, tags[symbol]);
 
   /* Add up the target state's active item numbers to get a hash key.
      */
   key = 0;
-  for (i = 0; i < n; ++i)
+  for (i = 0; i < kernel_size[symbol]; ++i)
     key += kernel_base[symbol][i];
   key = key % STATE_TABLE_SIZE;
   sp = state_table[key];
@@ -248,11 +233,10 @@ get_state (int symbol)
       int found = 0;
       while (!found)
 	{
-	  if (sp->nitems == n)
+	  if (sp->nitems == kernel_size[symbol])
 	    {
-	      int i;
 	      found = 1;
-	      for (i = 0; i < n; ++i)
+	      for (i = 0; i < kernel_size[symbol]; ++i)
 		if (kernel_base[symbol][i] != sp->items[i])
 		  found = 0;
 	    }
@@ -276,6 +260,9 @@ get_state (int symbol)
       state_table[key] = sp = new_state (symbol);
     }
 
+  if (trace_flag)
+    fprintf (stderr, "Exiting get_state => %d\n", sp->number);
+
   return sp->number;
 }
 
@@ -294,8 +281,8 @@ append_states (void)
   int symbol;
 
   if (trace_flag)
-    fprintf (stderr, "Entering append_states\n");
-
+    fprintf (stderr, "Entering append_states, state = %d\n",
+	     this_state->number);
 
   /* first sort shift_symbol into increasing order */
 
@@ -555,19 +542,15 @@ augment_automaton (void)
 static void
 save_reductions (void)
 {
-  short *isp;
-  int item;
   int count;
-  reductions *p;
-
-  short *rend;
+  int i;
 
   /* Find and count the active items that represent ends of rules. */
 
   count = 0;
-  for (isp = itemset; isp < itemsetend; isp++)
+  for (i = 0; i < itemsetsize; ++i)
     {
-      item = ritem[*isp];
+      int item = ritem[itemset[i]];
       if (item < 0)
 	redset[count++] = -item;
     }
@@ -576,7 +559,7 @@ save_reductions (void)
 
   if (count)
     {
-      p = REDUCTIONS_ALLOC (count);
+      reductions *p = REDUCTIONS_ALLOC (count);
 
       p->number = this_state->number;
       p->nreds = count;