unsigned *fp1;
unsigned *fp2;
int redprec;
- errs *errp = (errs *) xcalloc (sizeof (errs) + ntokens * sizeof (short), 1);
+ errs *errp = ERRS_ALLOC (ntokens + 1);
short *errtokens = errp->errs;
/* find the rule to reduce by to get precedence of reduction */
- redprec = rprec[LAruleno[lookaheadnum]];
+ redprec = rule_table[LAruleno[lookaheadnum]].prec;
mask = 1;
- fp1 = LA + lookaheadnum * tokensetsize;
+ fp1 = LA (lookaheadnum);
fp2 = lookaheadset;
for (i = 0; i < ntokens; i++)
{
/* 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 *) xcalloc ((unsigned int) i, 1);
+ err_table[state] = ERRS_ALLOC (i + 1);
bcopy (errp, err_table[state], i);
}
else
static void
set_conflicts (int state)
{
- int i;
- int k;
+ int i, j;
shifts *shiftp;
- unsigned *fp2;
- unsigned *fp3;
- unsigned *fp4;
- unsigned *fp1;
- int symbol;
- if (consistent[state])
+ if (state_table[state].consistent)
return;
for (i = 0; i < tokensetsize; i++)
shiftp = state_table[state].shift_table;
if (shiftp)
- {
- k = shiftp->nshifts;
- for (i = 0; i < k; i++)
- {
- symbol = state_table[shiftp->shifts[i]].accessing_symbol;
- if (ISVAR (symbol))
- break;
- SETBIT (lookaheadset, symbol);
- }
- }
-
- k = lookaheads[state + 1];
- fp4 = lookaheadset + tokensetsize;
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); 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
precedence */
- for (i = lookaheads[state]; i < k; i++)
- if (rprec[LAruleno[i]])
- {
- fp1 = LA + i * tokensetsize;
- fp2 = fp1;
- fp3 = lookaheadset;
-
- while (fp3 < fp4)
+ for (i = state_table[state].lookaheads;
+ i < state_table[state + 1].lookaheads;
+ ++i)
+ if (rule_table[LAruleno[i]].prec)
+ for (j = 0; j < tokensetsize; ++j)
+ if (LA (i)[j] & lookaheadset[j])
{
- if (*fp2++ & *fp3++)
- {
- resolve_sr_conflict (state, i);
- break;
- }
+ resolve_sr_conflict (state, i);
+ break;
}
- }
/* Loop over all rules which require lookahead in this state. Check
for conflicts not resolved above. */
- for (i = lookaheads[state]; i < k; i++)
+ for (i = state_table[state].lookaheads;
+ i < state_table[state + 1].lookaheads;
+ ++i)
{
- fp1 = LA + i * tokensetsize;
- fp2 = fp1;
- fp3 = lookaheadset;
-
- while (fp3 < fp4)
- if (*fp2++ & *fp3++)
+ for (j = 0; j < tokensetsize; ++j)
+ if (LA (i)[j] & lookaheadset[j])
conflicts[state] = 1;
- fp2 = fp1;
- fp3 = lookaheadset;
-
- while (fp3 < fp4)
- *fp3++ |= *fp2++;
+ for (j = 0; j < tokensetsize; ++j)
+ lookaheadset[j] |= LA (i)[j];
}
}
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 = lookaheads[state + 1];
- fp3 = lookaheadset + tokensetsize;
-
- for (i = lookaheads[state]; i < k; i++)
- {
- fp1 = LA + i * tokensetsize;
- fp2 = lookaheadset;
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
- 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 = lookaheads[state];
- int n = lookaheads[state + 1];
+ int m = state_table[state].lookaheads;
+ int n = state_table[state + 1].lookaheads;
if (n - m < 2)
return 0;
- mask = 1;
- baseword = LA + m * tokensetsize;
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;
void
conflicts_output (FILE *out)
{
+ bool printed_sth = FALSE;
int i;
for (i = 0; i < nstates; i++)
if (conflicts[i])
fprintf (out, _("State %d contains "), i);
fputs (conflict_report (count_sr_conflicts (i),
count_rr_conflicts (i)), out);
+ printed_sth = TRUE;
}
+ if (printed_sth)
+ fputs ("\n\n", out);
}
{
int i;
+ /* Is the number of SR conflicts OK? Either EXPECTED_CONFLICTS is
+ not set, and then we want 0 SR, or else it is specified, in which
+ case we want equality. */
+ int src_ok = 0;
+
int src_total = 0;
int rrc_total = 0;
rrc_total += count_rr_conflicts (i);
}
+ src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);
+
+ /* If there are no RR conflicts, and as many SR conflicts as
+ expected, then there is nothing to report. */
+ if (!rrc_total && src_ok)
+ return;
+
/* Report the total number of conflicts on STDERR. */
- if (src_total || rrc_total)
+ if (yacc_flag)
{
- if (yacc_flag)
- {
- /* If invoked with `--yacc', use the output format specified by
- POSIX. */
- fprintf (stderr, _("conflicts: "));
- if (src_total > 0)
- fprintf (stderr, _(" %d shift/reduce"), src_total);
- if (src_total > 0 && rrc_total > 0)
- fprintf (stderr, ",");
- if (rrc_total > 0)
- fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
- putc ('\n', stderr);
- }
- else
- {
- fprintf (stderr, _("%s contains "), infile);
- fputs (conflict_report (src_total, rrc_total), stderr);
- }
+ /* If invoked with `--yacc', use the output format specified by
+ POSIX. */
+ fprintf (stderr, _("conflicts: "));
+ if (src_total > 0)
+ fprintf (stderr, _(" %d shift/reduce"), src_total);
+ if (src_total > 0 && rrc_total > 0)
+ fprintf (stderr, ",");
+ if (rrc_total > 0)
+ fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
+ putc ('\n', stderr);
+ }
+ else
+ {
+ fprintf (stderr, _("%s contains "), infile);
+ fputs (conflict_report (src_total, rrc_total), stderr);
}
- if (expected_conflicts != -1
- && src_total != expected_conflicts)
+ if (expected_conflicts != -1 && !src_ok)
{
complain_message_count++;
- fprintf (stderr, ngettext ("expected %d shift/reduce conflict",
- "expected %d shift/reduce conflicts",
+ fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n",
+ "expected %d shift/reduce conflicts\n",
expected_conflicts),
expected_conflicts);
}
{
int i;
int j;
- int k;
- unsigned *fp1;
- unsigned *fp2;
- unsigned *fp3;
- unsigned *fp4;
- int rule;
- int symbol;
- unsigned mask;
int m;
int n;
- int default_LA;
- int default_rule = 0;
- int cmax;
- int count;
shifts *shiftp;
errs *errp;
int nodefault = 0;
shiftp = state_table[state].shift_table;
if (shiftp)
- {
- 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;
- /* if this state has a shift for the error token,
- don't use a default rule. */
- if (symbol == error_token_number)
- nodefault = 1;
- SETBIT (shiftset, symbol);
- }
- }
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ {
+ /* 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, SHIFT_SYMBOL (shiftp, i));
+ }
errp = err_table[state];
if (errp)
- {
- k = errp->nerrs;
- for (i = 0; i < k; i++)
- {
- if (!errp->errs[i])
- continue;
- symbol = errp->errs[i];
- SETBIT (shiftset, symbol);
- }
- }
+ for (i = 0; i < errp->nerrs; i++)
+ if (errp->errs[i])
+ SETBIT (shiftset, errp->errs[i]);
- m = lookaheads[state];
- n = lookaheads[state + 1];
+ m = state_table[state].lookaheads;
+ n = state_table[state + 1].lookaheads;
if (n - m == 1 && !nodefault)
{
- default_rule = LAruleno[m];
-
- fp1 = LA + m * tokensetsize;
- fp2 = shiftset;
- fp3 = lookaheadset;
- fp4 = lookaheadset + tokensetsize;
-
- while (fp3 < fp4)
- *fp3++ = *fp1++ & *fp2++;
+ int k;
+ int default_rule = LAruleno[m];
- mask = 1;
- fp3 = lookaheadset;
+ for (k = 0; k < tokensetsize; ++k)
+ lookaheadset[k] = LA (m)[k] & shiftset[k];
for (i = 0; i < ntokens; i++)
- {
- if (mask & *fp3)
- fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"),
- tags[i], default_rule, tags[rlhs[default_rule]]);
-
- mask <<= 1;
- if (mask == 0)
- {
- mask = 1;
- fp3++;
- }
- }
+ if (BITISSET (lookaheadset, i))
+ fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"),
+ tags[i], default_rule,
+ tags[rule_table[default_rule].lhs]);
fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
- default_rule, tags[rlhs[default_rule]]);
+ default_rule, tags[rule_table[default_rule].lhs]);
}
else if (n - m >= 1)
{
- cmax = 0;
- default_LA = -1;
- fp4 = lookaheadset + tokensetsize;
+ int k;
+
+ int cmax = 0;
+ int default_LA = -1;
+ int default_rule = 0;
if (!nodefault)
for (i = m; i < n; i++)
{
- fp1 = LA + i * tokensetsize;
- fp2 = shiftset;
- fp3 = lookaheadset;
+ int count = 0;
- while (fp3 < fp4)
- *fp3++ = *fp1++ & (~(*fp2++));
+ for (k = 0; k < tokensetsize; ++k)
+ lookaheadset[k] = LA (i)[k] & ~shiftset[k];
- count = 0;
- mask = 1;
- fp3 = lookaheadset;
for (j = 0; j < ntokens; j++)
- {
- if (mask & *fp3)
- count++;
-
- mask <<= 1;
- if (mask == 0)
- {
- mask = 1;
- fp3++;
- }
- }
+ if (BITISSET (lookaheadset, j))
+ count++;
if (count > cmax)
{
default_rule = LAruleno[i];
}
- fp2 = shiftset;
- fp3 = lookaheadset;
-
- while (fp3 < fp4)
- *fp2++ |= *fp3++;
+ for (k = 0; k < tokensetsize; ++k)
+ shiftset[k] |= lookaheadset[k];
}
for (i = 0; i < tokensetsize; i++)
shiftset[i] = 0;
if (shiftp)
- {
- 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);
- }
- }
+ for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
+ SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
- mask = 1;
- fp1 = LA + m * tokensetsize;
- fp2 = shiftset;
for (i = 0; i < ntokens; i++)
{
int defaulted = 0;
+ int count = BITISSET (shiftset, i);
- if (mask & *fp2)
- count = 1;
- else
- count = 0;
-
- fp3 = fp1;
for (j = m; j < n; j++)
{
- if (mask & *fp3)
+ if (BITISSET (LA (m), j))
{
if (count == 0)
{
if (j != default_LA)
- {
- rule = LAruleno[j];
- fprintf (out,
- _(" %-4s\treduce using rule %d (%s)\n"),
- tags[i], rule, tags[rlhs[rule]]);
- }
+ fprintf (out,
+ _(" %-4s\treduce using rule %d (%s)\n"),
+ tags[i],
+ LAruleno[j],
+ tags[rule_table[LAruleno[j]].lhs]);
else
defaulted = 1;
else
{
if (defaulted)
- {
- rule = LAruleno[default_LA];
- fprintf (out,
- _(" %-4s\treduce using rule %d (%s)\n"),
- tags[i], rule, tags[rlhs[rule]]);
- defaulted = 0;
- }
- rule = LAruleno[j];
+ fprintf (out,
+ _(" %-4s\treduce using rule %d (%s)\n"),
+ tags[i],
+ LAruleno[default_LA],
+ tags[rule_table[LAruleno[default_LA]].lhs]);
+ defaulted = 0;
fprintf (out,
_(" %-4s\t[reduce using rule %d (%s)]\n"),
- tags[i], rule, tags[rlhs[rule]]);
+ tags[i],
+ LAruleno[j],
+ tags[rule_table[LAruleno[j]].lhs]);
}
}
-
- fp3 += tokensetsize;
- }
-
- mask <<= 1;
- if (mask == 0)
- {
- mask = 1;
- /* We tried incrementing just fp1, and just fp2; both seem wrong.
- It seems necessary to increment both in sync. */
- fp1++;
- fp2++;
}
}
if (default_LA >= 0)
fprintf (out, _(" $default\treduce using rule %d (%s)\n"),
- default_rule, tags[rlhs[default_rule]]);
+ default_rule, tags[rule_table[default_rule].lhs]);
}
}
projects / bison.git / blobdiff