* src/nullable.c (set_nullable): Useless rules must be skipped,

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index bb6f8ac7b849a900ef874a8dfeb2973300c6e1cc..a9ea208ad4114a04739d0857949be9d1bc834b1a 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -29,7 +29,6 @@
 #include "reader.h"
 #include "LR0.h"
 
 #include "reader.h"
 #include "LR0.h"
 

-errs **err_table = NULL;

 /* -1 stands for not specified. */
 int expected_conflicts = -1;
 static char *conflicts = NULL;
 /* -1 stands for not specified. */
 int expected_conflicts = -1;
 static char *conflicts = NULL;


@@ -57,21 +56,12 @@ Conflict in state %d between rule %d and token %s resolved as %s.\n"),
 static void
 flush_shift (int state, int token)
 {
 static void
 flush_shift (int state, int token)
 {

-  shifts *shiftp;
-  int k, i;
-
-  shiftp = state_table[state].shift_table;
+  shifts *shiftp = state_table[state].shifts;
+  int i;

 
 

-  if (shiftp)
-    {
-      k = shiftp->nshifts;
-      for (i = 0; i < k; i++)
-       {
-         if (shiftp->shifts[i]
-             && token == state_table[shiftp->shifts[i]].accessing_symbol)
-           (shiftp->shifts[i]) = 0;
-       }
-    }
+  for (i = 0; i < shiftp->nshifts; i++)
+    if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
+      SHIFT_DISABLE (shiftp, i);

 }
 
 
 }
 
 


@@ -86,95 +76,79 @@ static void
 resolve_sr_conflict (int state, int lookaheadnum)
 {
   int i;
 resolve_sr_conflict (int state, int lookaheadnum)
 {
   int i;

-  int mask;
-  unsigned *fp1;
-  unsigned *fp2;
-  int redprec;
+  /* find the rule to reduce by to get precedence of reduction  */
+  int redprec = rule_table[LAruleno[lookaheadnum]].prec;

   errs *errp = ERRS_ALLOC (ntokens + 1);
   short *errtokens = errp->errs;
 
   errs *errp = ERRS_ALLOC (ntokens + 1);
   short *errtokens = errp->errs;
 

-  /* find the rule to reduce by to get precedence of reduction  */
-  redprec = rule_table[LAruleno[lookaheadnum]].prec;
-
-  mask = 1;
-  fp1 = LA (lookaheadnum);
-  fp2 = lookaheadset;

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

-    {
-      if ((mask & *fp2 & *fp1) && sprec[i])
-       /* Shift-reduce conflict occurs for token number i
-          and it has a precedence.
-          The precedence of shifting is that of token i.  */
-       {
-         if (sprec[i] < redprec)
-           {
-             log_resolution (state, lookaheadnum, i, _("reduce"));
-             *fp2 &= ~mask;    /* flush the shift for this token */
-             flush_shift (state, i);
-           }
-         else if (sprec[i] > redprec)
-           {
-             log_resolution (state, lookaheadnum, i, _("shift"));
-             *fp1 &= ~mask;    /* flush the reduce for this token */
-           }
-         else
-           {
-             /* Matching precedence levels.
-                For left association, keep only the reduction.
-                For right association, keep only the shift.
-                For nonassociation, keep neither.  */
+    if (BITISSET (LA (lookaheadnum), i)
+       && BITISSET (lookaheadset, i)
+       && sprec[i])
+      /* Shift-reduce conflict occurs for token number i
+        and it has a precedence.
+        The precedence of shifting is that of token i.  */
+      {
+       if (sprec[i] < redprec)
+         {
+           log_resolution (state, lookaheadnum, i, _("reduce"));
+           /* flush the shift for this token */
+           RESETBIT (lookaheadset, i);
+           flush_shift (state, i);
+         }
+       else if (sprec[i] > redprec)
+         {
+           log_resolution (state, lookaheadnum, i, _("shift"));
+           /* flush the reduce for this token */
+           RESETBIT (LA (lookaheadnum), i);
+         }
+       else
+         {
+           /* Matching precedence levels.
+              For left association, keep only the reduction.
+              For right association, keep only the shift.
+              For nonassociation, keep neither.  */

 
 

-             switch (sassoc[i])
-               {
-               case right_assoc:
-                 log_resolution (state, lookaheadnum, i, _("shift"));
-                 break;
+           switch (sassoc[i])
+             {
+             case right_assoc:
+               log_resolution (state, lookaheadnum, i, _("shift"));
+               break;

 
 

-               case left_assoc:
-                 log_resolution (state, lookaheadnum, i, _("reduce"));
-                 break;
+             case left_assoc:
+               log_resolution (state, lookaheadnum, i, _("reduce"));
+               break;

 
 

-               case non_assoc:
-                 log_resolution (state, lookaheadnum, i, _("an error"));
-                 break;
-               }
+             case non_assoc:
+               log_resolution (state, lookaheadnum, i, _("an error"));
+               break;
+             }

 
 

-             if (sassoc[i] != right_assoc)
-               {
-                 *fp2 &= ~mask;        /* flush the shift for this token */
-                 flush_shift (state, i);
-               }
-             if (sassoc[i] != left_assoc)
-               {
-                 *fp1 &= ~mask;        /* flush the reduce for this token */
-               }
-             if (sassoc[i] == non_assoc)
-               {
-                 /* Record an explicit error for this token.  */
-                 *errtokens++ = i;
-               }
-           }
-       }
+           if (sassoc[i] != right_assoc)
+             {
+               /* flush the shift for this token */
+               RESETBIT (lookaheadset, i);
+               flush_shift (state, i);
+             }
+           if (sassoc[i] != left_assoc)
+             {
+               /* flush the reduce for this token */
+               RESETBIT (LA (lookaheadnum), i);
+             }
+           if (sassoc[i] == non_assoc)
+             {
+               /* Record an explicit error for this token.  */
+               *errtokens++ = i;
+             }
+         }
+      }

 
 

-      mask <<= 1;
-      if (mask == 0)
-       {
-         mask = 1;
-         fp2++;
-         fp1++;
-       }
-    }

   errp->nerrs = errtokens - errp->errs;
   errp->nerrs = errtokens - errp->errs;

-  if (errp->nerrs)
-    {
-      /* Some tokens have been explicitly made errors.  Allocate
-         a permanent errs structure for this state, to record them.  */
-      i = (char *) errtokens - (char *) errp;
-      err_table[state] = ERRS_ALLOC (i + 1);
-      bcopy (errp, err_table[state], i);
-    }
-  else
-    err_table[state] = 0;
+  /* Some tokens have been explicitly made errors.  Allocate a
+     permanent errs structure for this state, to record them.  */
+  i = (char *) errtokens - (char *) errp;
+  state_table[state].errs = ERRS_ALLOC (i + 1);
+  memcpy (state_table[state].errs, errp, i);

   free (errp);
 }
 
   free (errp);
 }
 


@@ -184,7 +158,6 @@ set_conflicts (int state)
 {
   int i, j;
   shifts *shiftp;
 {
   int i, j;
   shifts *shiftp;

-  int symbol;

 
   if (state_table[state].consistent)
     return;
 
   if (state_table[state].consistent)
     return;


@@ -192,15 +165,10 @@ set_conflicts (int state)
   for (i = 0; i < tokensetsize; i++)
     lookaheadset[i] = 0;
 
   for (i = 0; i < tokensetsize; i++)
     lookaheadset[i] = 0;
 

-  shiftp = state_table[state].shift_table;
-  if (shiftp)
-    for (i = 0; i < shiftp->nshifts; i++)
-      {
-       symbol = state_table[shiftp->shifts[i]].accessing_symbol;
-       if (ISVAR (symbol))
-         break;
-       SETBIT (lookaheadset, symbol);
-      }
+  shiftp = state_table[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));

 
   /* 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


@@ -241,8 +209,6 @@ solve_conflicts (void)
   shiftset = XCALLOC (unsigned, tokensetsize);
   lookaheadset = XCALLOC (unsigned, tokensetsize);
 
   shiftset = XCALLOC (unsigned, tokensetsize);
   lookaheadset = XCALLOC (unsigned, tokensetsize);
 

-  err_table = XCALLOC (errs *, nstates);
-

   for (i = 0; i < nstates; i++)
     set_conflicts (i);
 }
   for (i = 0; i < nstates; i++)
     set_conflicts (i);
 }


@@ -257,7 +223,7 @@ count_sr_conflicts (int state)
 {
   int i, k;
   int src_count = 0;
 {
   int i, k;
   int src_count = 0;

-  shifts *shiftp = state_table[state].shift_table;
+  shifts *shiftp = state_table[state].shifts;

 
   if (!shiftp)
     return 0;
 
   if (!shiftp)
     return 0;


@@ -269,10 +235,8 @@ count_sr_conflicts (int state)
     }
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     }
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)

-    {
-      int symbol = state_table[shiftp->shifts[i]].accessing_symbol;
-      SETBIT (shiftset, symbol);
-    }
+    if (!SHIFT_IS_DISABLED (shiftp, i))
+      SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));

 
   for (i = state_table[state].lookaheads;
        i < state_table[state + 1].lookaheads;
 
   for (i = state_table[state].lookaheads;
        i < state_table[state + 1].lookaheads;


@@ -451,7 +415,6 @@ print_reductions (FILE *out, int state)
 {
   int i;
   int j;
 {
   int i;
   int j;

-  int symbol;

   int m;
   int n;
   shifts *shiftp;
   int m;
   int n;
   shifts *shiftp;


@@ -461,23 +424,18 @@ print_reductions (FILE *out, int state)
   for (i = 0; i < tokensetsize; i++)
     shiftset[i] = 0;
 
   for (i = 0; i < tokensetsize; i++)
     shiftset[i] = 0;
 

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

       {
       {

-       if (!shiftp->shifts[i])
-         continue;
-       symbol = state_table[shiftp->shifts[i]].accessing_symbol;
-       if (ISVAR (symbol))
-         break;
-       /* if this state has a shift for the error token,
-          don't use a default rule.  */
-       if (symbol == error_token_number)
+       /* if this state has a shift for the error token, don't use a
+          default rule.  */
+       if (SHIFT_IS_ERROR (shiftp, i))

          nodefault = 1;
          nodefault = 1;

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

       }
 
       }
 

-  errp = err_table[state];
+  errp = state_table[state].errs;

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


@@ -537,16 +495,9 @@ print_reductions (FILE *out, int state)
       for (i = 0; i < tokensetsize; i++)
        shiftset[i] = 0;
 
       for (i = 0; i < tokensetsize; i++)
        shiftset[i] = 0;
 

-      if (shiftp)
-       for (i = 0; i < shiftp->nshifts; i++)
-         {
-           if (!shiftp->shifts[i])
-             continue;
-           symbol = state_table[shiftp->shifts[i]].accessing_symbol;
-           if (ISVAR (symbol))
-             break;
-           SETBIT (shiftset, symbol);
-         }
+      for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+       if (!SHIFT_IS_DISABLED (shiftp, i))
+         SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));

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