* src/closure.c (closure): `b' and `ruleno' denote the same value:

keep ruleno only.

diff --git a/ChangeLog b/ChangeLog
index 944950d1fe6dd0e522ca529e2bffb28adbb3ab90..fd561b93dbb5d57ddaf3461e0272b121904349e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-28  Akim Demaille  <akim@epita.fr>
+
+       * src/closure.c (closure): `b' and `ruleno' denote the same value:
+       keep ruleno only.
+
+       

 2001-11-28  Akim Demaille  <akim@epita.fr>
 
        * src/closure.c (closure): Instead of looping over word in array
 2001-11-28  Akim Demaille  <akim@epita.fr>
 
        * src/closure.c (closure): Instead of looping over word in array

diff --git a/src/closure.c b/src/closure.c
index 874bbbd5540d9ceae1221f0edcc552fd40a7e8d0..2cee4f80903669a1376dd268f1eb3ad60fc040ef 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -235,7 +235,6 @@ new_closure (int n)
 void
 closure (short *core, int n)
 {
 void
 closure (short *core, int n)
 {

-  int ruleno;

   /* Index over CORE. */
   int c;
 
   /* Index over CORE. */
   int c;
 


@@ -243,7 +242,7 @@ closure (short *core, int n)
   int r;
 
   /* A bit index over RULESET. */
   int r;
 
   /* A bit index over RULESET. */

-  int b;
+  int ruleno;

 
   if (trace_flag)
     {
 
   if (trace_flag)
     {


@@ -269,26 +268,21 @@ closure (short *core, int n)
            ruleset[r] |= FDERIVES (ritem[core[c]])[r];
     }
 
            ruleset[r] |= FDERIVES (ritem[core[c]])[r];
     }
 

-  ruleno = 0;

   itemsetsize = 0;
   c = 0;
   itemsetsize = 0;
   c = 0;

-  for (b = 0; b < rulesetsize * BITS_PER_WORD; ++b)
-    {
-      if (BITISSET (ruleset, b))
-       {
-         int itemno = rule_table[ruleno].rhs;
-         while (c < n && core[c] < itemno)
-           {
-             itemset[itemsetsize] = core[c];
-             itemsetsize++;
-             c++;
-           }
-         itemset[itemsetsize] = itemno;
-         itemsetsize++;
-       }
-
-      ruleno++;
-    }
+  for (ruleno = 0; ruleno < rulesetsize * BITS_PER_WORD; ++ruleno)
+    if (BITISSET (ruleset, ruleno))
+      {
+       int itemno = rule_table[ruleno].rhs;
+       while (c < n && core[c] < itemno)
+         {
+           itemset[itemsetsize] = core[c];
+           itemsetsize++;
+           c++;
+         }
+       itemset[itemsetsize] = itemno;
+       itemsetsize++;
+      }

 
   while (c < n)
     {
 
   while (c < n)
     {