* src/output.c (output_rule_data): Fix various range errors:

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index c16c6f52dafaea945a222c3f6103f32c6c312cf2..192e46e25bda3933294d7e427f2f2a721923647c 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -24,6 +24,8 @@
    tokens they accept.  */
 
 #include "system.h"
+#include "bitset.h"
+#include "bitsetv.h"
 #include "reader.h"
 #include "types.h"
 #include "LR0.h"
@@ -38,20 +40,18 @@
 /* All the decorated states, indexed by the state number.  */
 state_t **states = NULL;
 
-int tokensetsize;
-short *LAruleno;
-unsigned *LA;
+short *LAruleno = NULL;
+bitsetv LA = NULL;
 size_t nLA;
 
 static int ngotos;
-short *goto_map;
-short *from_state;
-short *to_state;
+short *goto_map = NULL;
+short *from_state = NULL;
+short *to_state = NULL;
 
 /* 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 bitsetv F = NULL;
 
 static short **includes;
 static shorts **lookback;
@@ -74,9 +74,7 @@ static void
 traverse (int i)
 {
   int j;
-  size_t k;
   int height;
-  size_t size = F (i + 1) - F(i);
 
   VERTICES[++top] = i;
   INDEX[i] = height = top;
@@ -90,8 +88,7 @@ traverse (int i)
        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)
@@ -103,8 +100,7 @@ traverse (int i)
        if (i == j)
          break;
 
-       for (k = 0; k < size; ++k)
-         F (j)[k] = F (i)[k];
+       bitset_copy (F[j], F[i]);
       }
 }
 
@@ -136,7 +132,7 @@ digraph (short **relation)
 static void
 initialize_LA (void)
 {
-  int i;
+  size_t i;
   int j;
   short *np;
 
@@ -144,7 +140,7 @@ initialize_LA (void)
   if (!nLA)
     nLA = 1;
 
-  LA = XCALLOC (unsigned, nLA * tokensetsize);
+  LA = bitsetv_create (nLA, ntokens, BITSET_FIXED);
   LAruleno = XCALLOC (short, nLA);
   lookback = XCALLOC (shorts *, nLA);
 
@@ -159,7 +155,8 @@ initialize_LA (void)
 static void
 set_goto_map (void)
 {
-  int state, i;
+  size_t state;
+  int i;
   short *temp_map;
 
   goto_map = XCALLOC (short, nvars + 1) - ntokens;
@@ -255,7 +252,7 @@ initialize_F (void)
 
   int i;
 
-  F = XCALLOC (unsigned, ngotos * tokensetsize);
+  F = bitsetv_create (ngotos, ntokens, BITSET_FIXED);
 
   for (i = 0; i < ngotos; i++)
     {
@@ -264,7 +261,7 @@ initialize_F (void)
 
       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++)
        {
@@ -420,7 +417,7 @@ build_relations (void)
          state_t *state = states[from_state[i]];
          states1[0] = state->number;
 
-         for (rp = &ritem[rules[*rulep].rhs]; *rp >= 0; rp++)
+         for (rp = rules[*rulep].rhs; *rp >= 0; rp++)
            {
              shifts *sp = state->shifts;
              int j;
@@ -493,19 +490,14 @@ compute_lookaheads (void)
 
   for (i = 0; i < nLA; i++)
     for (sp = lookback[i]; sp; sp = sp->next)
-      {
-       int size = LA (i + 1) - LA (i);
-       int j;
-       for (j = 0; j < size; ++j)
-         LA (i)[j] |= F (sp->value)[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);
-  XFREE (F);
+  bitsetv_free (F);
 }
 
 
@@ -516,7 +508,7 @@ compute_lookaheads (void)
 static void
 initialize_lookaheads (void)
 {
-  int i;
+  size_t i;
   nLA = 0;
   for (i = 0; i < nstates; i++)
     {
@@ -556,7 +548,8 @@ initialize_lookaheads (void)
 static void
 lookaheads_print (FILE *out)
 {
-  int i, j, k;
+  size_t i;
+  int j, k;
   fprintf (out, "Lookaheads: BEGIN\n");
   for (i = 0; i < nstates; ++i)
     {
@@ -565,7 +558,7 @@ lookaheads_print (FILE *out)
 
       for (j = 0; j < states[i]->nlookaheads; ++j)
        for (k = 0; k < ntokens; ++k)
-         if (BITISSET (LA (states[i]->lookaheadsp + j), j))
+         if (bitset_test (LA[states[i]->lookaheadsp + j], j))
            fprintf (out, "   on %d (%s) -> rule %d\n",
                     k, symbols[k]->tag,
                     -LAruleno[states[i]->lookaheadsp + j] - 1);
@@ -576,8 +569,6 @@ lookaheads_print (FILE *out)
 void
 lalr (void)
 {
-  tokensetsize = WORDSIZE (ntokens);
-
   initialize_lookaheads ();
   initialize_LA ();
   set_goto_map ();