* src/closure.c (closure): Use nrules instead of playing tricks

[bison.git] / src / closure.c

diff --git a/src/closure.c b/src/closure.c
index b06d808fa27dd184d57f22a121e4be053eeab0d6..12bb5817f36f340af9696e23dd06891c106a31d6 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -26,14 +26,20 @@
 #include "derives.h"
 #include "warshall.h"
 
 #include "derives.h"
 #include "warshall.h"
 

+/* NITEMSET is the size of the array ITEMSET.  */

 short *itemset;
 short *itemset;

-short *itemsetend;
+int nitemset;
+

 static unsigned *ruleset;
 
 /* internal data.  See comments before set_fderives and set_firsts.  */
 static unsigned *fderives;
 static unsigned *firsts;
 
 static unsigned *ruleset;
 
 /* internal data.  See comments before set_fderives and set_firsts.  */
 static unsigned *fderives;
 static unsigned *firsts;
 

+/* 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;
 
 /* number of words required to hold a bit for each rule */
 static int rulesetsize;
 


@@ -46,35 +52,36 @@ static int varsetsize;
 `-----------------*/
 
 static void
 `-----------------*/
 
 static void

-print_closure (int n)
+print_closure (const char *title, short *array, size_t size)

 {
 {

-  short *isp;
-
-  fprintf (stderr, "\n\nn = %d\n\n", n);
-  for (isp = itemset; isp < itemsetend; isp++)
-    fprintf (stderr, "   %d\n", *isp);
+  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);

 }
 
 
 static void
 print_firsts (void)
 {
 }
 
 
 static void
 print_firsts (void)
 {

-  int i;
-  int j;
-  unsigned *rowp;
-
-  fprintf (stderr, "\n\n\nFIRSTS\n\n");
+  int i, j;

 
 

+  fprintf (stderr, "FIRSTS\n");

   for (i = ntokens; i < nsyms; i++)
     {
   for (i = ntokens; i < nsyms; i++)
     {

-      fprintf (stderr, "\n\n%s firsts\n\n", tags[i]);
-
-      rowp = firsts + ((i - ntokens) * varsetsize);
-
+      fprintf (stderr, "\t%s firsts\n", tags[i]);

       for (j = 0; j < nvars; j++)
       for (j = 0; j < nvars; j++)

-       if (BITISSET (rowp, j))
-         fprintf (stderr, "   %s\n", tags[j + ntokens]);
+       if (BITISSET (FIRSTS (i), j))
+         fprintf (stderr, "\t\t%d (%s)\n", j + ntokens, tags[j + ntokens]);

     }
     }

+  fprintf (stderr, "\n\n");

 }
 
 
 }
 
 


@@ -83,19 +90,23 @@ print_fderives (void)
 {
   int i;
   int j;
 {
   int i;
   int j;

-  unsigned *rp;

 
 

-  fprintf (stderr, "\n\n\nFDERIVES\n");
+  fprintf (stderr, "FDERIVES\n");

 
   for (i = ntokens; i < nsyms; i++)
     {
 
   for (i = ntokens; i < nsyms; i++)
     {

-      fprintf (stderr, "\n\n%s derives\n\n", tags[i]);
-      rp = fderives + i * rulesetsize;
-
+      fprintf (stderr, "\t%s derives\n", tags[i]);

       for (j = 0; j <= nrules; j++)
       for (j = 0; j <= nrules; j++)

-       if (BITISSET (rp, j))
-         fprintf (stderr, "   %d\n", j);
+       if (BITISSET (FDERIVES (i), j))
+         {
+           short *rhsp;
+           fprintf (stderr, "\t\t%d:", j);
+           for (rhsp = ritem + rule_table[j].rhs; *rhsp > 0; ++rhsp)
+             fprintf (stderr, " %s", tags[*rhsp]);
+           fputc ('\n', stderr);
+         }

     }
     }

+  fprintf (stderr, "\n\n");

 }
 \f
 /*-------------------------------------------------------------------.
 }
 \f
 /*-------------------------------------------------------------------.


@@ -111,33 +122,19 @@ print_fderives (void)
 static void
 set_firsts (void)
 {
 static void
 set_firsts (void)
 {

-  unsigned *row;
-  int symbol;
-  short *sp;
-  int rowsize;
+  int i, j;

 
 

-  int i;
+  varsetsize = WORDSIZE (nvars);

 
 

-  varsetsize = rowsize = WORDSIZE (nvars);
+  firsts = XCALLOC (unsigned, nvars * varsetsize);

 
 

-  firsts = XCALLOC (unsigned, nvars * rowsize);
-
-  row = firsts;

   for (i = ntokens; i < nsyms; i++)
   for (i = ntokens; i < nsyms; i++)

-    {
-      sp = derives[i];
-      while (*sp >= 0)
-       {
-         symbol = ritem[rule_table[*sp++].rhs];
-         if (ISVAR (symbol))
-           {
-             symbol -= ntokens;
-             SETBIT (row, symbol);
-           }
-       }
-
-      row += rowsize;
-    }
+    for (j = 0; derives[i][j] >= 0; ++j)
+      {
+       int symbol = ritem[rule_table[derives[i][j]].rhs];
+       if (ISVAR (symbol))
+         SETBIT (FIRSTS (i), symbol - ntokens);
+      }

 
   RTC (firsts, nvars);
 
 
   RTC (firsts, nvars);
 


@@ -158,48 +155,17 @@ set_firsts (void)
 static void
 set_fderives (void)
 {
 static void
 set_fderives (void)
 {

-  unsigned *rrow;
-  unsigned *vrow;
-  int j;
-  unsigned cword;
-  short *rp;
-  int b;
-
-  int ruleno;
-  int i;
+  int i, j, k;

 
 

-  fderives = XCALLOC (unsigned, nvars * rulesetsize) - ntokens * rulesetsize;
+  fderives = XCALLOC (unsigned, nvars * rulesetsize);

 
   set_firsts ();
 
 
   set_firsts ();
 

-  rrow = fderives + ntokens * rulesetsize;
-
-  for (i = ntokens; i < nsyms; i++)
-    {
-      vrow = firsts + ((i - ntokens) * varsetsize);
-      cword = *vrow++;
-      b = 0;
-      for (j = ntokens; j < nsyms; j++)
-       {
-         if (cword & (1 << b))
-           {
-             rp = derives[j];
-             while ((ruleno = *rp++) > 0)
-               {
-                 SETBIT (rrow, ruleno);
-               }
-           }
-
-         b++;
-         if (b >= BITS_PER_WORD && j + 1 < nsyms)
-           {
-             cword = *vrow++;
-             b = 0;
-           }
-       }
-
-      rrow += rulesetsize;
-    }
+  for (i = ntokens; i < nsyms; ++i)
+    for (j = ntokens; j < nsyms; ++j)
+      if (BITISSET (FIRSTS (i), j - ntokens))
+       for (k = 0; derives[j][k] > 0; ++k)
+         SETBIT (FDERIVES (i), derives[j][k]);

 
   if (trace_flag)
     print_fderives ();
 
   if (trace_flag)
     print_fderives ();


@@ -224,81 +190,59 @@ new_closure (int n)
 void
 closure (short *core, int n)
 {
 void
 closure (short *core, int n)
 {

-  int ruleno;
-  unsigned word;
-  short *csp;
-  unsigned *dsp;
-  unsigned *rsp;
+  /* Index over CORE. */
+  int c;

 
 

-  short *csend;
-  unsigned *rsend;
-  int symbol;
-  int itemno;
+  /* Index over RULESET. */
+  int r;

 
 

-  rsp = ruleset;
-  rsend = ruleset + rulesetsize;
-  csend = core + n;
+  /* A bit index over RULESET. */
+  int ruleno;
+
+  if (trace_flag)
+    print_closure ("input", core, n);

 
   if (n == 0)
     {
 
   if (n == 0)
     {

-      dsp = fderives + start_symbol * rulesetsize;
-      while (rsp < rsend)
-       *rsp++ = *dsp++;
+      for (r = 0; r < rulesetsize; ++r)
+       ruleset[r] = FDERIVES (start_symbol)[r];

     }
   else
     {
     }
   else
     {

-      while (rsp < rsend)
-       *rsp++ = 0;
-
-      csp = core;
-      while (csp < csend)
-       {
-         symbol = ritem[*csp++];
-         if (ISVAR (symbol))
-           {
-             dsp = fderives + symbol * rulesetsize;
-             rsp = ruleset;
-             while (rsp < rsend)
-               *rsp++ |= *dsp++;
-           }
-       }
+      for (r = 0; r < rulesetsize; ++r)
+       ruleset[r] = 0;
+
+      for (c = 0; c < n; ++c)
+       if (ISVAR (ritem[core[c]]))
+         for (r = 0; r < rulesetsize; ++r)
+           ruleset[r] |= FDERIVES (ritem[core[c]])[r];

     }
 
     }
 

-  ruleno = 0;
-  itemsetend = itemset;
-  csp = core;
-  rsp = ruleset;
-  while (rsp < rsend)
+  nitemset = 0;
+  c = 0;
+  for (ruleno = 0; ruleno < nrules + 1; ++ruleno)
+    if (BITISSET (ruleset, ruleno))
+      {
+       int itemno = rule_table[ruleno].rhs;
+       while (c < n && core[c] < itemno)
+         {
+           itemset[nitemset] = core[c];
+           nitemset++;
+           c++;
+         }
+       itemset[nitemset] = itemno;
+       nitemset++;
+      }
+
+  while (c < n)

     {
     {

-      word = *rsp++;
-      if (word == 0)
-       {
-         ruleno += BITS_PER_WORD;
-       }
-      else
-       {
-         int b;
-
-         for (b = 0; b < BITS_PER_WORD; b++)
-           {
-             if (word & (1 << b))
-               {
-                 itemno = rule_table[ruleno].rhs;
-                 while (csp < csend && *csp < itemno)
-                   *itemsetend++ = *csp++;
-                 *itemsetend++ = itemno;
-               }
-
-             ruleno++;
-           }
-       }
+      itemset[nitemset] = core[c];
+      nitemset++;
+      c++;

     }
 
     }
 

-  while (csp < csend)
-    *itemsetend++ = *csp++;
-

   if (trace_flag)
   if (trace_flag)

-    print_closure (n);
+    print_closure ("output", itemset, nitemset);

 }
 
 
 }
 
 


@@ -307,5 +251,5 @@ free_closure (void)
 {
   XFREE (itemset);
   XFREE (ruleset);
 {
   XFREE (itemset);
   XFREE (ruleset);

-  XFREE (fderives + ntokens * rulesetsize);
+  XFREE (fderives);

 }
 }