* src/conflicts.c (print_reductions): Formatting changes.

diff --git a/ChangeLog b/ChangeLog
index 30d62e867407795e9f7c11aaf9b0d668e32f0af0..47dc83f35085c5ac75f2e8b45813d2bda6b65d93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-17  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (print_reductions): Formatting changes.
+
+       

 2001-12-17  Akim Demaille  <akim@epita.fr>
 
        * src/conflicts.c (flush_shift): Also adjust lookaheadset.
 2001-12-17  Akim Demaille  <akim@epita.fr>
 
        * src/conflicts.c (flush_shift): Also adjust lookaheadset.

diff --git a/src/conflicts.c b/src/conflicts.c
index cbd002d513114defbdb2c7d1da80c4e37fb63aa0..f10c36b335d6dcbed3b370dfb4f2cd613f7696fa 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -414,16 +414,15 @@ print_reductions (FILE *out, int state)
 {
   int i;
   int j;
 {
   int i;
   int j;

-  int m;
-  int n;
-  shifts *shiftp;
-  errs *errp;
+  int m = state_table[state]->lookaheads;
+  int n = state_table[state + 1]->lookaheads;
+  shifts *shiftp = state_table[state]->shifts;
+  errs *errp = state_table[state]->errs;

   int nodefault = 0;
 
   for (i = 0; i < tokensetsize; i++)
     shiftset[i] = 0;
 
   int nodefault = 0;
 
   for (i = 0; i < tokensetsize; i++)
     shiftset[i] = 0;
 

-  shiftp = state_table[state]->shifts;

   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {


@@ -434,15 +433,11 @@ print_reductions (FILE *out, int state)
        SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
       }
 
        SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
       }
 

-  errp = state_table[state]->errs;

   if (errp)
     for (i = 0; i < errp->nerrs; i++)
       if (errp->errs[i])
        SETBIT (shiftset, errp->errs[i]);
 
   if (errp)
     for (i = 0; i < errp->nerrs; i++)
       if (errp->errs[i])
        SETBIT (shiftset, errp->errs[i]);
 

-  m = state_table[state]->lookaheads;
-  n = state_table[state + 1]->lookaheads;
-

   if (n - m == 1 && !nodefault)
     {
       int k;
   if (n - m == 1 && !nodefault)
     {
       int k;