static void
flush_shift (int state, int token)
{
- shifts *shiftp;
- int k, i;
-
- shiftp = state_table[state].shift_table;
+ shifts *shiftp = state_table[state].shift_table;
+ 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);
}
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;
- /* 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++)
{
- if ((mask & *fp2 & *fp1) && sprec[i])
+ 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"));
- *fp2 &= ~mask; /* flush the shift for this token */
+ /* flush the shift for this token */
+ RESETBIT (lookaheadset, i);
flush_shift (state, i);
}
else if (sprec[i] > redprec)
{
log_resolution (state, lookaheadnum, i, _("shift"));
- *fp1 &= ~mask; /* flush the reduce for this token */
+ /* flush the reduce for this token */
+ RESETBIT (LA (lookaheadnum), i);
}
else
{
if (sassoc[i] != right_assoc)
{
- *fp2 &= ~mask; /* flush the shift for this token */
+ /* flush the shift for this token */
+ RESETBIT (lookaheadset, i);
flush_shift (state, i);
}
if (sassoc[i] != left_assoc)
{
- *fp1 &= ~mask; /* flush the reduce for this token */
+ /* flush the reduce for this token */
+ RESETBIT (LA (lookaheadnum), i);
}
if (sassoc[i] == non_assoc)
{
}
}
}
-
- mask <<= 1;
- if (mask == 0)
- {
- mask = 1;
- fp2++;
- fp1++;
- }
}
errp->nerrs = errtokens - errp->errs;
if (errp->nerrs)
{
int i, j;
shifts *shiftp;
- int symbol;
if (state_table[state].consistent)
return;
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);
- }
+ 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
static int
count_sr_conflicts (int state)
{
- int i;
- int k;
- int mask;
- shifts *shiftp;
- unsigned *fp1;
- unsigned *fp2;
- unsigned *fp3;
- int symbol;
-
+ int i, k;
int src_count = 0;
+ shifts *shiftp = state_table[state].shift_table;
- shiftp = state_table[state].shift_table;
if (!shiftp)
return 0;
lookaheadset[i] = 0;
}
- k = shiftp->nshifts;
- for (i = 0; i < k; i++)
- {
- if (!shiftp->shifts[i])
- continue;
- symbol = state_table[shiftp->shifts[i]].accessing_symbol;
- if (ISVAR (symbol))
- break;
- SETBIT (shiftset, symbol);
- }
-
- k = state_table[state + 1].lookaheads;
- fp3 = lookaheadset + tokensetsize;
+ 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 = state_table[state].lookaheads; i < k; i++)
- {
- fp1 = LA (i);
- fp2 = lookaheadset;
-
- while (fp2 < fp3)
- *fp2++ |= *fp1++;
- }
-
- fp1 = shiftset;
- fp2 = lookaheadset;
+ for (i = state_table[state].lookaheads;
+ i < state_table[state + 1].lookaheads;
+ ++i)
+ for (k = 0; k < tokensetsize; ++k)
+ lookaheadset[k] |= LA (i)[k];
- while (fp2 < fp3)
- *fp2++ &= *fp1++;
+ for (k = 0; k < tokensetsize; ++k)
+ lookaheadset[k] &= shiftset[k];
- mask = 1;
- fp2 = lookaheadset;
for (i = 0; i < ntokens; i++)
- {
- if (mask & *fp2)
- src_count++;
-
- mask <<= 1;
- if (mask == 0)
- {
- mask = 1;
- fp2++;
- }
- }
+ if (BITISSET (lookaheadset, i))
+ src_count++;
return src_count;
}
count_rr_conflicts (int state)
{
int i;
- unsigned mask;
- unsigned *baseword;
-
int rrc_count = 0;
int m = state_table[state].lookaheads;
if (n - m < 2)
return 0;
- mask = 1;
- baseword = LA (m);
for (i = 0; i < ntokens; i++)
{
- unsigned *wordp = baseword;
-
int count = 0;
int j;
for (j = m; j < n; j++)
- {
- if (mask & *wordp)
- count++;
-
- wordp += tokensetsize;
- }
+ if (BITISSET (LA (m), j))
+ count++;
if (count >= 2)
rrc_count++;
-
- mask <<= 1;
- if (mask == 0)
- {
- mask = 1;
- baseword++;
- }
}
return rrc_count;
{
int i;
int j;
- int symbol;
int m;
int n;
- int default_LA;
- int default_rule = 0;
- int cmax;
shifts *shiftp;
errs *errp;
int nodefault = 0;
shiftset[i] = 0;
shiftp = state_table[state].shift_table;
- if (shiftp)
- for (i = 0; i < shiftp->nshifts; i++)
+ 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;
- SETBIT (shiftset, symbol);
+ SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
}
errp = err_table[state];
if (n - m == 1 && !nodefault)
{
int k;
- default_rule = LAruleno[m];
+ int default_rule = LAruleno[m];
for (k = 0; k < tokensetsize; ++k)
lookaheadset[k] = LA (m)[k] & shiftset[k];
{
int k;
- cmax = 0;
- default_LA = -1;
+ int cmax = 0;
+ int default_LA = -1;
+ int default_rule = 0;
if (!nodefault)
for (i = m; i < n; i++)
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++)
{
projects / bison.git / blobdiff