* src/LR0.c (augment_automaton): Better variable locality.

[bison.git] / src / closure.c

diff --git a/src/closure.c b/src/closure.c
index 83effa9175b4cddc348e1257a5c47a7dd35580b5..77ca72c8f1846880a6dd09aacdfa2fb4e567086c 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -26,9 +26,9 @@
 #include "derives.h"
 #include "warshall.h"
 
-/* ITEMSETSIZE is the size of the array ITEMSET.  */
+/* NITEMSET is the size of the array ITEMSET.  */
 short *itemset;
-int itemsetsize;
+int nitemset;
 
 static unsigned *ruleset;
 
@@ -36,8 +36,9 @@ static unsigned *ruleset;
 static unsigned *fderives;
 static unsigned *firsts;
 
-#define FDERIVES(Symbol)   (fderives + (Symbol) * rulesetsize)
-#define   FIRSTS(Symbol)   (firsts   + (Symbol) * varsetsize)
+/* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var.  */
+#define FDERIVES(Var)   (fderives + ((Var) - ntokens) * rulesetsize)
+#define   FIRSTS(Var)   (firsts   + ((Var) - ntokens) * varsetsize)
 
 /* number of words required to hold a bit for each rule */
 static int rulesetsize;
@@ -51,13 +52,19 @@ static int varsetsize;
 `-----------------*/
 
 static void
-print_closure (int n)
+print_closure (const char *title, short *array, size_t size)
 {
-  int i;
-  fprintf (stderr, "n = %d\n", n);
-  for (i = 0; i < itemsetsize; ++i)
-    fprintf (stderr, "   %d\n", itemset[i]);
-  fprintf (stderr, "\n\n");
+  size_t i;
+  fprintf (stderr, "Closure: %s\n", title);
+  for (i = 0; i < size; ++i)
+    {
+      short *rp;
+      fprintf (stderr, "  %2d: .", array[i]);
+      for (rp = &ritem[array[i]]; *rp > 0; ++rp)
+       fprintf (stderr, " %s", tags[*rp]);
+      fprintf (stderr, "  (rule %d)\n", -*rp);
+    }
+  fputs ("\n\n", stderr);
 }
 
 
@@ -71,7 +78,7 @@ print_firsts (void)
     {
       fprintf (stderr, "\t%s firsts\n", tags[i]);
       for (j = 0; j < nvars; j++)
-       if (BITISSET (FIRSTS (i - ntokens), j))
+       if (BITISSET (FIRSTS (i), j))
          fprintf (stderr, "\t\t%d (%s)\n", j + ntokens, tags[j + ntokens]);
     }
   fprintf (stderr, "\n\n");
@@ -115,20 +122,18 @@ print_fderives (void)
 static void
 set_firsts (void)
 {
-  int rowsize;
-
   int i, j;
 
-  varsetsize = rowsize = WORDSIZE (nvars);
+  varsetsize = WORDSIZE (nvars);
 
-  firsts = XCALLOC (unsigned, nvars * rowsize);
+  firsts = XCALLOC (unsigned, nvars * varsetsize);
 
   for (i = ntokens; i < nsyms; i++)
     for (j = 0; derives[i][j] >= 0; ++j)
       {
        int symbol = ritem[rule_table[derives[i][j]].rhs];
        if (ISVAR (symbol))
-         SETBIT (FIRSTS (i - ntokens), symbol - ntokens);
+         SETBIT (FIRSTS (i), symbol - ntokens);
       }
 
   RTC (firsts, nvars);
@@ -152,13 +157,13 @@ set_fderives (void)
 {
   int i, j, k;
 
-  fderives = XCALLOC (unsigned, nvars * rulesetsize) - ntokens * rulesetsize;
+  fderives = XCALLOC (unsigned, nvars * rulesetsize);
 
   set_firsts ();
 
   for (i = ntokens; i < nsyms; ++i)
     for (j = ntokens; j < nsyms; ++j)
-      if (BITISSET (FIRSTS (i - ntokens), j - ntokens))
+      if (BITISSET (FIRSTS (i), j - ntokens))
        for (k = 0; derives[j][k] > 0; ++k)
          SETBIT (FDERIVES (i), derives[j][k]);
 
@@ -195,12 +200,7 @@ closure (short *core, int n)
   int ruleno;
 
   if (trace_flag)
-    {
-      fprintf (stderr, "Entering closure (items = {");
-      for (c = 0; c < n; ++c)
-       fprintf (stderr, " %d ", core[c]);
-      fprintf (stderr, "})\n");
-    }
+    print_closure ("input", core, n);
 
   if (n == 0)
     {
@@ -218,7 +218,7 @@ closure (short *core, int n)
            ruleset[r] |= FDERIVES (ritem[core[c]])[r];
     }
 
-  itemsetsize = 0;
+  nitemset = 0;
   c = 0;
   for (ruleno = 0; ruleno < rulesetsize * BITS_PER_WORD; ++ruleno)
     if (BITISSET (ruleset, ruleno))
@@ -226,23 +226,23 @@ closure (short *core, int n)
        int itemno = rule_table[ruleno].rhs;
        while (c < n && core[c] < itemno)
          {
-           itemset[itemsetsize] = core[c];
-           itemsetsize++;
+           itemset[nitemset] = core[c];
+           nitemset++;
            c++;
          }
-       itemset[itemsetsize] = itemno;
-       itemsetsize++;
+       itemset[nitemset] = itemno;
+       nitemset++;
       }
 
   while (c < n)
     {
-      itemset[itemsetsize] = core[c];
-      itemsetsize++;
+      itemset[nitemset] = core[c];
+      nitemset++;
       c++;
     }
 
   if (trace_flag)
-    print_closure (n);
+    print_closure ("output", itemset, nitemset);
 }
 
 
@@ -251,5 +251,5 @@ free_closure (void)
 {
   XFREE (itemset);
   XFREE (ruleset);
-  XFREE (fderives + ntokens * rulesetsize);
+  XFREE (fderives);
 }