* src/lalr.c (F): Now a bitset*.

Adjust all dependencies.

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

 2002-03-04  Akim Demaille  <akim@epita.fr>
 
        * src/conflicts.c (shiftset, lookaheadset): Now bitset.
 2002-03-04  Akim Demaille  <akim@epita.fr>
 
        * src/conflicts.c (shiftset, lookaheadset): Now bitset.

diff --git a/src/lalr.c b/src/lalr.c
index 30e9f31895b7ed6851ce44882dcc05b70ecb5544..87e91cd5f553e9857ab345cba7c43bb07eae3123 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -51,8 +51,7 @@ short *to_state = NULL;
 
 /* And for the famous F variable, which name is so descriptive that a
    comment is hardly needed.  <grin>.  */
 
 /* And for the famous F variable, which name is so descriptive that a
    comment is hardly needed.  <grin>.  */

-static unsigned *F = NULL;
-#define F(Rule)  (F + (Rule) * tokensetsize)
+static bitset *F = NULL;

 
 static short **includes;
 static shorts **lookback;
 
 static short **includes;
 static shorts **lookback;


@@ -75,9 +74,7 @@ static void
 traverse (int i)
 {
   int j;
 traverse (int i)
 {
   int j;

-  size_t k;

   int height;
   int height;

-  size_t size = F (i + 1) - F(i);

 
   VERTICES[++top] = i;
   INDEX[i] = height = top;
 
   VERTICES[++top] = i;
   INDEX[i] = height = top;


@@ -91,8 +88,7 @@ traverse (int i)
        if (INDEX[i] > INDEX[R[i][j]])
          INDEX[i] = INDEX[R[i][j]];
 
        if (INDEX[i] > INDEX[R[i][j]])
          INDEX[i] = INDEX[R[i][j]];
 

-       for (k = 0; k < size; ++k)
-         F (i)[k] |= F (R[i][j])[k];
+       bitset_or (F[i], F[i], F[R[i][j]]);

       }
 
   if (INDEX[i] == height)
       }
 
   if (INDEX[i] == height)


@@ -104,8 +100,7 @@ traverse (int i)
        if (i == j)
          break;
 
        if (i == j)
          break;
 

-       for (k = 0; k < size; ++k)
-         F (j)[k] = F (i)[k];
+       bitset_copy (F[j], F[i]);

       }
 }
 
       }
 }
 


@@ -262,7 +257,12 @@ initialize_F (void)
 
   int i;
 
 
   int i;
 

-  F = XCALLOC (unsigned, ngotos * tokensetsize);
+  F = XCALLOC (bitset, ngotos);
+  for (i = 0; i < ngotos; ++i)
+    {
+      F[i] = bitset_create (ntokens, BITSET_FIXED);
+      bitset_zero (F[i]);
+    }

 
   for (i = 0; i < ngotos; i++)
     {
 
   for (i = 0; i < ngotos; i++)
     {


@@ -271,7 +271,7 @@ initialize_F (void)
 
       int j;
       for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
 
       int j;
       for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)

-       SETBIT (F (i), SHIFT_SYMBOL (sp, j));
+       bitset_set (F[i], SHIFT_SYMBOL (sp, j));

 
       for (; j < sp->nshifts; j++)
        {
 
       for (; j < sp->nshifts; j++)
        {


@@ -500,18 +500,15 @@ compute_lookaheads (void)
 
   for (i = 0; i < nLA; i++)
     for (sp = lookback[i]; sp; sp = sp->next)
 
   for (i = 0; i < nLA; i++)
     for (sp = lookback[i]; sp; sp = sp->next)

-      {
-       int j;
-       for (j = 0; j < ntokens; ++j)
-         if (BITISSET (F (sp->value), j))
-           bitset_set (LA[i], j);
-      }
+      bitset_or (LA[i], LA[i], F[sp->value]);

 
   /* Free LOOKBACK. */
   for (i = 0; i < nLA; i++)
     LIST_FREE (shorts, lookback[i]);
 
   XFREE (lookback);
 
   /* Free LOOKBACK. */
   for (i = 0; i < nLA; i++)
     LIST_FREE (shorts, lookback[i]);
 
   XFREE (lookback);

+  for (i = 0; i < (unsigned) ngotos; ++i)
+    bitset_free (F[i]);

   XFREE (F);
 }
 
   XFREE (F);
 }