X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/97650f4efc420eb5eb0af124f28987875e10428a..f377f69fec28013c79db4efe12bbb9d48987fb2c:/src/closure.c

diff --git a/src/closure.c b/src/closure.c
index 689326de..3d5ac28d 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -74,12 +74,13 @@ print_firsts (void)
   fprintf (stderr, "FIRSTS\n");
   for (i = ntokens; i < nsyms; i++)
     {
+      bitset_iterator iter;
       fprintf (stderr, "\t%s firsts\n", symbols[i]->tag);
-      BITSET_EXECUTE (FIRSTS (i), 0, j,
-      {
-	fprintf (stderr, "\t\t%s\n",
-		 symbols[j + ntokens]->tag);
-      });
+      BITSET_FOR_EACH (iter, FIRSTS (i), j, 0)
+	{
+	  fprintf (stderr, "\t\t%s\n",
+		   symbols[j + ntokens]->tag);
+	}
     }
   fprintf (stderr, "\n\n");
 }
@@ -94,15 +95,13 @@ print_fderives (void)
   fprintf (stderr, "FDERIVES\n");
   for (i = ntokens; i < nsyms; i++)
     {
+      bitset_iterator iter;
       fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
-      BITSET_EXECUTE (FDERIVES (i), 0, r,
-      {
-	item_number_t *rhsp = NULL;
-	fprintf (stderr, "\t\t%d:", r - 1);
-	for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
-	  fprintf (stderr, " %s", symbols[*rhsp]->tag);
-	fputc ('\n', stderr);
-      });
+      BITSET_FOR_EACH (iter, FDERIVES (i), r, 0)
+	{
+	  fprintf (stderr, "\t\t%3d ", r);
+	  rule_rhs_print (&rules[r], stderr);
+	}
     }
   fprintf (stderr, "\n\n");
 }
@@ -126,20 +125,20 @@ set_firsts (void)
   firsts = bitsetv_create (nvars, nvars, BITSET_FIXED);
 
   for (i = ntokens; i < nsyms; i++)
-    for (j = 0; derives[i][j] >= 0; ++j)
+    for (j = 0; derives[i][j]; ++j)
       {
-	int symbol = rules[derives[i][j]].rhs[0];
+	int symbol = derives[i][j]->rhs[0];
 	if (ISVAR (symbol))
 	  bitset_set (FIRSTS (i), symbol - ntokens);
       }
 
-  if (trace_flag)
+  if (trace_flag & trace_sets)
     bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);
   bitsetv_reflexive_transitive_closure (firsts);
-  if (trace_flag)
+  if (trace_flag & trace_sets)
     bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);
 
-  if (trace_flag)
+  if (trace_flag & trace_sets)
     print_firsts ();
 }
 
@@ -159,17 +158,17 @@ set_fderives (void)
   symbol_number_t i, j;
   rule_number_t k;
 
-  fderives = bitsetv_create (nvars, nrules + 1, BITSET_FIXED);
+  fderives = bitsetv_create (nvars, nrules, BITSET_FIXED);
 
   set_firsts ();
 
   for (i = ntokens; i < nsyms; ++i)
     for (j = ntokens; j < nsyms; ++j)
       if (bitset_test (FIRSTS (i), j - ntokens))
-	for (k = 0; derives[j][k] > 0; ++k)
-	  bitset_set (FDERIVES (i), derives[j][k]);
+	for (k = 0; derives[j][k]; ++k)
+	  bitset_set (FDERIVES (i), derives[j][k]->number);
 
-  if (trace_flag)
+  if (trace_flag & trace_sets)
     print_fderives ();
 
   bitsetv_free (firsts);
@@ -182,7 +181,7 @@ new_closure (int n)
 {
   itemset = XCALLOC (item_number_t, n);
 
-  ruleset = bitset_create (nrules + 1, BITSET_FIXED);
+  ruleset = bitset_create (nrules, BITSET_FIXED);
 
   set_fderives ();
 }
@@ -198,7 +197,9 @@ closure (item_number_t *core, int n)
   /* A bit index over RULESET. */
   rule_number_t ruleno;
 
-  if (trace_flag)
+  bitset_iterator iter;
+
+  if (trace_flag & trace_sets)
     print_closure ("input", core, n);
 
   bitset_zero (ruleset);
@@ -209,18 +210,18 @@ closure (item_number_t *core, int n)
 
   nritemset = 0;
   c = 0;
-  BITSET_EXECUTE (ruleset, 0, ruleno,
-  {
-    item_number_t itemno = rules[ruleno].rhs - ritem;
-    while (c < n && core[c] < itemno)
-      {
-	itemset[nritemset] = core[c];
-	nritemset++;
-	c++;
-      }
-    itemset[nritemset] = itemno;
-    nritemset++;
-  });
+  BITSET_FOR_EACH (iter, ruleset, ruleno, 0)
+    {
+      item_number_t itemno = rules[ruleno].rhs - ritem;
+      while (c < n && core[c] < itemno)
+	{
+	  itemset[nritemset] = core[c];
+	  nritemset++;
+	  c++;
+	}
+      itemset[nritemset] = itemno;
+      nritemset++;
+    };
 
   while (c < n)
     {
@@ -229,7 +230,7 @@ closure (item_number_t *core, int n)
       c++;
     }
 
-  if (trace_flag)
+  if (trace_flag & trace_sets)
     print_closure ("output", itemset, nritemset);
 }