shifts *shiftp = state_table[state]->shifts;
int i;
+ RESETBIT (lookaheadset, token);
for (i = 0; i < shiftp->nshifts; i++)
if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
SHIFT_DISABLE (shiftp, i);
}
+/*-------------------------------------------------------------------.
+| Turn off the reduce recorded for the specified token for the |
+| specified lookahead. Used when we resolve a shift-reduce conflict |
+| in favor of the shift. |
+`-------------------------------------------------------------------*/
+
+static void
+flush_reduce (int lookahead, int token)
+{
+ RESETBIT (LA (lookahead), token);
+}
+
+
/*------------------------------------------------------------------.
| Attempt to resolve shift-reduce conflict for one rule by means of |
| precedence declarations. It has already been checked that the |
`------------------------------------------------------------------*/
static void
-resolve_sr_conflict (int state, int lookaheadnum)
+resolve_sr_conflict (int state, int lookahead)
{
int i;
/* find the rule to reduce by to get precedence of reduction */
- int redprec = rule_table[LAruleno[lookaheadnum]].prec;
+ int redprec = rule_table[LAruleno[lookahead]].prec;
errs *errp = ERRS_ALLOC (ntokens + 1);
short *errtokens = errp->errs;
for (i = 0; i < ntokens; i++)
- if (BITISSET (LA (lookaheadnum), i)
+ if (BITISSET (LA (lookahead), 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. */
{
+ /* 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);
+ log_resolution (state, lookahead, i, _("reduce"));
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);
+ log_resolution (state, lookahead, i, _("shift"));
+ flush_reduce (lookahead, i);
}
else
- {
- /* Matching precedence levels.
- For left association, keep only the reduction.
- For right association, keep only the shift.
- For nonassociation, keep neither. */
+ /* 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;
-
- case left_assoc:
- log_resolution (state, lookaheadnum, i, _("reduce"));
- break;
-
- case non_assoc:
- log_resolution (state, lookaheadnum, i, _("an error"));
- break;
- }
-
- 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;
- }
- }
+ switch (sassoc[i])
+ {
+ case right_assoc:
+ log_resolution (state, lookahead, i, _("shift"));
+ flush_reduce (lookahead, i);
+ break;
+
+ case left_assoc:
+ log_resolution (state, lookahead, i, _("reduce"));
+ flush_shift (state, i);
+ break;
+
+ case non_assoc:
+ log_resolution (state, lookahead, i, _("an error"));
+ flush_shift (state, i);
+ flush_reduce (lookahead, i);
+ /* Record an explicit error for this token. */
+ *errtokens++ = i;
+ break;
+ }
}
errp->nerrs = errtokens - errp->errs;
/* 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 < state_table[state + 1]->lookaheads;
+ for (i = state_table[state]->lookaheadsp;
+ i < state_table[state + 1]->lookaheadsp;
++i)
if (rule_table[LAruleno[i]].prec)
for (j = 0; j < tokensetsize; ++j)
/* Loop over all rules which require lookahead in this state. Check
for conflicts not resolved above. */
- for (i = state_table[state]->lookaheads;
- i < state_table[state + 1]->lookaheads;
+ for (i = state_table[state]->lookaheadsp;
+ i < state_table[state + 1]->lookaheadsp;
++i)
{
for (j = 0; j < tokensetsize; ++j)
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]->lookaheadsp;
+ i < state_table[state + 1]->lookaheadsp;
++i)
for (k = 0; k < tokensetsize; ++k)
lookaheadset[k] |= LA (i)[k];
int i;
int rrc_count = 0;
- int m = state_table[state]->lookaheads;
- int n = state_table[state + 1]->lookaheads;
+ int m = state_table[state]->lookaheadsp;
+ int n = state_table[state + 1]->lookaheadsp;
if (n - m < 2)
return 0;
print_reductions (FILE *out, int state)
{
int i;
- int j;
- int m;
- int n;
- shifts *shiftp;
- errs *errp;
+ int m = state_table[state]->lookaheadsp;
+ int n = state_table[state + 1]->lookaheadsp;
+ shifts *shiftp = state_table[state]->shifts;
+ errs *errp = state_table[state]->errs;
int nodefault = 0;
for (i = 0; i < tokensetsize; i++)
shiftset[i] = 0;
- shiftp = state_table[state]->shifts;
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
if (!SHIFT_IS_DISABLED (shiftp, i))
{
SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
}
- errp = state_table[state]->errs;
if (errp)
for (i = 0; i < errp->nerrs; i++)
if (errp->errs[i])
SETBIT (shiftset, errp->errs[i]);
- m = state_table[state]->lookaheads;
- n = state_table[state + 1]->lookaheads;
-
if (n - m == 1 && !nodefault)
{
int k;
}
else if (n - m >= 1)
{
- int k;
-
int cmax = 0;
int default_LA = -1;
int default_rule = 0;
for (i = m; i < n; i++)
{
int count = 0;
+ int j, k;
for (k = 0; k < tokensetsize; ++k)
lookaheadset[k] = LA (i)[k] & ~shiftset[k];
for (i = 0; i < ntokens; i++)
{
+ int j;
int defaulted = 0;
int count = BITISSET (shiftset, i);
for (j = m; j < n; j++)
{
- if (BITISSET (LA (m), j))
+ if (BITISSET (LA (j), i))
{
if (count == 0)
{
projects / bison.git / blobdiff