* src/conflicts.c (print_reductions): Improve variable locality.

diff --git a/ChangeLog b/ChangeLog
index a8687e6538094f5bd6f68328986c79d6cf046724..34324ab1272989f98f7f69f51a7f3f845e5858ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-05  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (print_reductions): Improve variable locality.
+
+       
 2001-12-05  Akim Demaille  <akim@epita.fr>
 
        * src/state.h (SHIFT_IS_ERROR, SHIFT_IS_GOTO, SHIFT_IS_SHIFT): New.

diff --git a/src/conflicts.c b/src/conflicts.c
index 82ce14603f5ee7c50ab702f878b15caddf93b5f8..0275891d1583e4dba5c1b360b19f89487e178948 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -502,11 +502,6 @@ print_reductions (FILE *out, int state)
 {
   int i;
   int j;
-  int k;
-  unsigned *fp1;
-  unsigned *fp2;
-  unsigned *fp3;
-  unsigned *fp4;
   int rule;
   int symbol;
   unsigned mask;
@@ -525,28 +520,24 @@ print_reductions (FILE *out, int state)
 
   shiftp = state_table[state].shift_table;
   if (shiftp)
-    {
-      k = shiftp->nshifts;
-      for (i = 0; i < k; i++)
-       {
-         if (!shiftp->shifts[i])
-           continue;
-         symbol = state_table[shiftp->shifts[i]].accessing_symbol;
-         if (ISVAR (symbol))
-           break;
-         /* if this state has a shift for the error token,
-            don't use a default rule.  */
-         if (symbol == error_token_number)
-           nodefault = 1;
-         SETBIT (shiftset, symbol);
-       }
-    }
+    for (i = 0; i < shiftp->nshifts; i++)
+      {
+       if (!shiftp->shifts[i])
+         continue;
+       symbol = state_table[shiftp->shifts[i]].accessing_symbol;
+       if (ISVAR (symbol))
+         break;
+       /* if this state has a shift for the error token,
+          don't use a default rule.  */
+       if (symbol == error_token_number)
+         nodefault = 1;
+       SETBIT (shiftset, symbol);
+      }
 
   errp = err_table[state];
   if (errp)
     {
-      k = errp->nerrs;
-      for (i = 0; i < k; i++)
+      for (i = 0; i < errp->nerrs; i++)
        {
          if (!errp->errs[i])
            continue;
@@ -560,12 +551,12 @@ print_reductions (FILE *out, int state)
 
   if (n - m == 1 && !nodefault)
     {
-      default_rule = LAruleno[m];
+      unsigned *fp1 = LA (m);
+      unsigned *fp2 = shiftset;
+      unsigned *fp3 = lookaheadset;
+      unsigned *fp4 = lookaheadset + tokensetsize;
 
-      fp1 = LA (m);
-      fp2 = shiftset;
-      fp3 = lookaheadset;
-      fp4 = lookaheadset + tokensetsize;
+      default_rule = LAruleno[m];
 
       while (fp3 < fp4)
        *fp3++ = *fp1++ & *fp2++;
@@ -593,6 +584,8 @@ print_reductions (FILE *out, int state)
     }
   else if (n - m >= 1)
     {
+      unsigned *fp1, *fp2, *fp3, *fp4;
+
       cmax = 0;
       default_LA = -1;
       fp4 = lookaheadset + tokensetsize;
@@ -642,8 +635,7 @@ print_reductions (FILE *out, int state)
 
       if (shiftp)
        {
-         k = shiftp->nshifts;
-         for (i = 0; i < k; i++)
+         for (i = 0; i < shiftp->nshifts; i++)
            {
              if (!shiftp->shifts[i])
                continue;