From d8cf039f973a00144c03aec8860e822bffd569e1 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 19 Nov 2001 10:38:39 +0000
Subject: [PATCH] * src/conflicts.c (set_conflicts): Use arrays instead of
 pointers to clarify.

---
 ChangeLog       |  6 +++++
 src/conflicts.c | 66 +++++++++++++++++--------------------------------
 2 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2238785c..a0d9e6a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-19  Akim Demaille  <akim@epita.fr>
+
+	* src/conflicts.c (set_conflicts): Use arrays instead of pointers
+	to clarify.
+
+	
 2001-11-19  Akim Demaille  <akim@epita.fr>
 
 	* src/closure.c (closure): Use arrays instead of pointers to clarify.
diff --git a/src/conflicts.c b/src/conflicts.c
index 2ca3cff8..02b843b3 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -182,13 +182,8 @@ resolve_sr_conflict (int state, int lookaheadnum)
 static void
 set_conflicts (int state)
 {
-  int i;
-  int k;
+  int i, j;
   shifts *shiftp;
-  unsigned *fp2;
-  unsigned *fp3;
-  unsigned *fp4;
-  unsigned *fp1;
   int symbol;
 
   if (state_table[state].consistent)
@@ -199,58 +194,41 @@ set_conflicts (int state)
 
   shiftp = state_table[state].shift_table;
   if (shiftp)
-    {
-      k = shiftp->nshifts;
-      for (i = 0; i < k; i++)
-	{
-	  symbol = state_table[shiftp->shifts[i]].accessing_symbol;
-	  if (ISVAR (symbol))
-	    break;
-	  SETBIT (lookaheadset, symbol);
-	}
-    }
-
-  k = state_table[state + 1].lookaheads;
-  fp4 = lookaheadset + tokensetsize;
+    for (i = 0; i < shiftp->nshifts; i++)
+      {
+	symbol = state_table[shiftp->shifts[i]].accessing_symbol;
+	if (ISVAR (symbol))
+	  break;
+	SETBIT (lookaheadset, symbol);
+      }
 
   /* Loop over all rules which require lookahead in this state.  First
      check for shift-reduce conflict, and try to resolve using
      precedence */
-  for (i = state_table[state].lookaheads; i < k; i++)
+  for (i = state_table[state].lookaheads;
+       i < state_table[state + 1].lookaheads;
+       ++i)
     if (rule_table[LAruleno[i]].prec)
-      {
-	fp1 = LA (i);
-	fp2 = fp1;
-	fp3 = lookaheadset;
-
-	while (fp3 < fp4)
+      for (j = 0; j < tokensetsize; ++j)
+	if (LA (i)[j] & lookaheadset[j])
 	  {
-	    if (*fp2++ & *fp3++)
-	      {
-		resolve_sr_conflict (state, i);
-		break;
-	      }
+	    resolve_sr_conflict (state, i);
+	    break;
 	  }
-      }
 
 
   /* Loop over all rules which require lookahead in this state.  Check
      for conflicts not resolved above.  */
-  for (i = state_table[state].lookaheads; i < k; i++)
+  for (i = state_table[state].lookaheads;
+       i < state_table[state + 1].lookaheads;
+       ++i)
     {
-      fp1 = LA (i);
-      fp2 = fp1;
-      fp3 = lookaheadset;
-
-      while (fp3 < fp4)
-	if (*fp2++ & *fp3++)
+      for (j = 0; j < tokensetsize; ++j)
+	if (LA (i)[j] & lookaheadset[j])
 	  conflicts[state] = 1;
 
-      fp2 = fp1;
-      fp3 = lookaheadset;
-
-      while (fp3 < fp4)
-	*fp3++ |= *fp2++;
+      for (j = 0; j < tokensetsize; ++j)
+	lookaheadset[j] |= LA (i)[j];
     }
 }
 
-- 
2.45.2