* src/conflicts.c (shiftset, lookaheadset): Now bitset.

Adjust all dependencies.

diff --git a/ChangeLog b/ChangeLog
index 75a9cfd5010388a78abe7600646a887f090f03f7..759f82a2c357b5f3c8bff924aab20c7da8ae8690 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-04  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (shiftset, lookaheadset): Now bitset.
+       Adjust all dependencies.
+
+       

 2002-03-04  Akim Demaille  <akim@epita.fr>
 
        * src/L0.c, src/LR0.h (nstates): Be size_t.
 2002-03-04  Akim Demaille  <akim@epita.fr>
 
        * src/L0.c, src/LR0.h (nstates): Be size_t.

diff --git a/src/conflicts.c b/src/conflicts.c
index b03d881d61cf95b6f3b2c724dd20aed86f4feb08..6d9562bc72749e04956e9520d34ef40b85d7fe89 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -35,8 +35,8 @@
 int expected_conflicts = -1;
 static char *conflicts = NULL;
 
 int expected_conflicts = -1;
 static char *conflicts = NULL;
 

-static unsigned *shiftset = NULL;
-static unsigned *lookaheadset = NULL;
+static bitset shiftset;
+static bitset lookaheadset;

 \f
 
 static inline void
 \f
 
 static inline void


@@ -63,7 +63,7 @@ flush_shift (state_t *state, int token)
   shifts *shiftp = state->shifts;
   int i;
 
   shifts *shiftp = state->shifts;
   int i;
 

-  RESETBIT (lookaheadset, token);
+  bitset_reset (lookaheadset, token);

   for (i = 0; i < shiftp->nshifts; i++)
     if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
       SHIFT_DISABLE (shiftp, i);
   for (i = 0; i < shiftp->nshifts; i++)
     if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
       SHIFT_DISABLE (shiftp, i);


@@ -101,7 +101,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
 
   for (i = 0; i < ntokens; i++)
     if (bitset_test (LA[lookahead], i)
 
   for (i = 0; i < ntokens; i++)
     if (bitset_test (LA[lookahead], i)

-       && BITISSET (lookaheadset, i)
+       && bitset_test (lookaheadset, i)

        && symbols[i]->prec)
       {
        /* Shift-reduce conflict occurs for token number i
        && symbols[i]->prec)
       {
        /* Shift-reduce conflict occurs for token number i


@@ -161,13 +161,12 @@ set_conflicts (state_t *state)
   if (state->consistent)
     return;
 
   if (state->consistent)
     return;
 

-  for (i = 0; i < tokensetsize; i++)
-    lookaheadset[i] = 0;
+  bitset_zero (lookaheadset);

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

-      SETBIT (lookaheadset, SHIFT_SYMBOL (shiftp, i));
+      bitset_set (lookaheadset, SHIFT_SYMBOL (shiftp, i));

 
   /* Loop over all rules which require lookahead in this state.  First
      check for shift-reduce conflict, and try to resolve using
 
   /* Loop over all rules which require lookahead in this state.  First
      check for shift-reduce conflict, and try to resolve using


@@ -176,7 +175,7 @@ set_conflicts (state_t *state)
     if (rules[LAruleno[state->lookaheadsp + i]].prec)
       for (j = 0; j < ntokens; ++j)
        if (bitset_test (LA[state->lookaheadsp + i], j)
     if (rules[LAruleno[state->lookaheadsp + i]].prec)
       for (j = 0; j < ntokens; ++j)
        if (bitset_test (LA[state->lookaheadsp + i], j)

-           && BITISSET (lookaheadset, j))
+           && bitset_test (lookaheadset, j))

          {
            resolve_sr_conflict (state, state->lookaheadsp + i);
            break;
          {
            resolve_sr_conflict (state, state->lookaheadsp + i);
            break;


@@ -189,12 +188,12 @@ set_conflicts (state_t *state)
     {
       for (j = 0; j < ntokens; ++j)
        if (bitset_test (LA[state->lookaheadsp + i], j)
     {
       for (j = 0; j < ntokens; ++j)
        if (bitset_test (LA[state->lookaheadsp + i], j)

-           && BITISSET (lookaheadset, j))
+           && bitset_test (lookaheadset, j))

          conflicts[state->number] = 1;
 
       for (j = 0; j < ntokens; ++j)
        if (bitset_test (LA[state->lookaheadsp + i], j))
          conflicts[state->number] = 1;
 
       for (j = 0; j < ntokens; ++j)
        if (bitset_test (LA[state->lookaheadsp + i], j))

-         SETBIT (lookaheadset, j);
+         bitset_set (lookaheadset, j);

     }
 }
 
     }
 }
 


@@ -204,8 +203,10 @@ solve_conflicts (void)
   size_t i;
 
   conflicts = XCALLOC (char, nstates);
   size_t i;
 
   conflicts = XCALLOC (char, nstates);

-  shiftset = XCALLOC (unsigned, tokensetsize);
-  lookaheadset = XCALLOC (unsigned, tokensetsize);
+  shiftset = bitset_create (ntokens, BITSET_FIXED);
+  bitset_zero (shiftset);
+  lookaheadset = bitset_create (ntokens, BITSET_FIXED);
+  bitset_zero (lookaheadset);

 
   for (i = 0; i < nstates; i++)
     set_conflicts (states[i]);
 
   for (i = 0; i < nstates; i++)
     set_conflicts (states[i]);


@@ -226,26 +227,22 @@ count_sr_conflicts (state_t *state)
   if (!shiftp)
     return 0;
 
   if (!shiftp)
     return 0;
 

-  for (i = 0; i < tokensetsize; i++)
-    {
-      shiftset[i] = 0;
-      lookaheadset[i] = 0;
-    }
+  bitset_zero (lookaheadset);
+  bitset_zero (shiftset);

 
   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))

-      SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+      bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));

 
   for (i = 0; i < state->nlookaheads; ++i)
     for (k = 0; k < ntokens; ++k)
       if (bitset_test (LA[state->lookaheadsp + i], k))
 
   for (i = 0; i < state->nlookaheads; ++i)
     for (k = 0; k < ntokens; ++k)
       if (bitset_test (LA[state->lookaheadsp + i], k))

-       SETBIT (lookaheadset, k);
+       bitset_set (lookaheadset, k);

 
 

-  for (k = 0; k < tokensetsize; ++k)
-    lookaheadset[k] &= shiftset[k];
+  bitset_and (lookaheadset, lookaheadset, shiftset);

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

-    if (BITISSET (lookaheadset, i))
+    if (bitset_test (lookaheadset, i))

       src_count++;
 
   return src_count;
       src_count++;
 
   return src_count;


@@ -408,6 +405,6 @@ void
 free_conflicts (void)
 {
   XFREE (conflicts);
 free_conflicts (void)
 {
   XFREE (conflicts);

-  XFREE (shiftset);
-  XFREE (lookaheadset);
+  bitset_free (shiftset);
+  bitset_free (lookaheadset);

 }
 }