#include "system.h"
#include "complain.h"
#include "getargs.h"
+#include "symtab.h"
#include "files.h"
#include "gram.h"
#include "state.h"
obstack_fgrow4 (&output_obstack,
_("\
Conflict in state %d between rule %d and token %s resolved as %s.\n"),
- state->number, LAruleno[LAno], tags[token], resolution);
+ state->number, LAruleno[LAno], symbols[token]->tag,
+ resolution);
}
{
int i;
/* find the rule to reduce by to get precedence of reduction */
- int redprec = rule_table[LAruleno[lookahead]].prec;
- errs *errp = ERRS_ALLOC (ntokens + 1);
- short *errtokens = errp->errs;
+ int redprec = rules[LAruleno[lookahead]].prec;
+ errs *errp = errs_new (ntokens + 1);
+ errp->nerrs = 0;
for (i = 0; i < ntokens; i++)
if (BITISSET (LA (lookahead), i)
&& BITISSET (lookaheadset, i)
- && sprec[i])
+ && symbols[i]->prec)
{
/* 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)
+ if (symbols[i]->prec < redprec)
{
log_resolution (state, lookahead, i, _("reduce"));
flush_shift (state, i);
}
- else if (sprec[i] > redprec)
+ else if (symbols[i]->prec > redprec)
{
log_resolution (state, lookahead, i, _("shift"));
flush_reduce (lookahead, i);
For right association, keep only the shift.
For nonassociation, keep neither. */
- switch (sassoc[i])
+ switch (symbols[i]->assoc)
{
case right_assoc:
log_resolution (state, lookahead, i, _("shift"));
flush_shift (state, i);
flush_reduce (lookahead, i);
/* Record an explicit error for this token. */
- *errtokens++ = i;
+ errp->errs[errp->nerrs++] = i;
break;
}
}
- errp->nerrs = errtokens - errp->errs;
/* Some tokens have been explicitly made errors. Allocate a
permanent errs structure for this state, to record them. */
- i = (char *) errtokens - (char *) errp;
- state->errs = ERRS_ALLOC (i + 1);
- memcpy (state->errs, errp, i);
+ state->errs = errs_dup (errp);
free (errp);
}
check for shift-reduce conflict, and try to resolve using
precedence */
for (i = 0; i < state->nlookaheads; ++i)
- if (rule_table[LAruleno[state->lookaheadsp + i]].prec)
+ if (rules[LAruleno[state->lookaheadsp + i]].prec)
for (j = 0; j < tokensetsize; ++j)
if (LA (state->lookaheadsp + i)[j] & lookaheadset[j])
{
lookaheadset = XCALLOC (unsigned, tokensetsize);
for (i = 0; i < nstates; i++)
- set_conflicts (state_table[i]);
+ set_conflicts (states[i]);
}
int count = 0;
int j;
for (j = 0; j < state->nlookaheads; ++j)
- if (BITISSET (LA (state->lookaheadsp), state->lookaheadsp + j))
+ if (BITISSET (LA (state->lookaheadsp + j), i))
count++;
if (count >= 2)
if (conflicts[i])
{
fprintf (out, _("State %d contains "), i);
- fputs (conflict_report (count_sr_conflicts (state_table[i]),
- count_rr_conflicts (state_table[i])), out);
+ fputs (conflict_report (count_sr_conflicts (states[i]),
+ count_rr_conflicts (states[i])), out);
printed_sth = TRUE;
}
if (printed_sth)
for (i = 0; i < nstates; i++)
if (conflicts[i])
{
- src_total += count_sr_conflicts (state_table[i]);
- rrc_total += count_rr_conflicts (state_table[i]);
+ src_total += count_sr_conflicts (states[i]);
+ rrc_total += count_rr_conflicts (states[i]);
}
src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);
}
-void
-print_reductions (FILE *out, state_t *state)
-{
- int i;
- shifts *shiftp = state->shifts;
- errs *errp = state->errs;
- int nodefault = 0;
-
- for (i = 0; i < tokensetsize; i++)
- shiftset[i] = 0;
-
- for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
- if (!SHIFT_IS_DISABLED (shiftp, 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));
- }
-
- if (errp)
- for (i = 0; i < errp->nerrs; i++)
- if (errp->errs[i])
- SETBIT (shiftset, errp->errs[i]);
-
- if (state->nlookaheads == 1 && !nodefault)
- {
- int k;
- int default_rule = LAruleno[state->lookaheadsp];
-
- for (k = 0; k < tokensetsize; ++k)
- lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
-
- for (i = 0; i < ntokens; i++)
- 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[rule_table[default_rule].lhs]);
- }
- else if (state->nlookaheads >= 1)
- {
- int cmax = 0;
- int default_LA = -1;
- int default_rule = 0;
-
- if (!nodefault)
- for (i = 0; i < state->nlookaheads; ++i)
- {
- int count = 0;
- int j, k;
-
- for (k = 0; k < tokensetsize; ++k)
- lookaheadset[k] = LA (state->lookaheadsp + i)[k] & ~shiftset[k];
-
- for (j = 0; j < ntokens; j++)
- if (BITISSET (lookaheadset, j))
- count++;
-
- if (count > cmax)
- {
- cmax = count;
- default_LA = state->lookaheadsp + i;
- default_rule = LAruleno[state->lookaheadsp + i];
- }
-
- for (k = 0; k < tokensetsize; ++k)
- shiftset[k] |= lookaheadset[k];
- }
-
- for (i = 0; i < tokensetsize; i++)
- shiftset[i] = 0;
-
- 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++)
- {
- int j;
- int defaulted = 0;
- int count = BITISSET (shiftset, i);
-
- for (j = 0; j < state->nlookaheads; ++j)
- {
- if (BITISSET (LA (state->lookaheadsp + j), i))
- {
- if (count == 0)
- {
- if (state->lookaheadsp + j != default_LA)
- fprintf (out,
- _(" %-4s\treduce using rule %d (%s)\n"),
- tags[i],
- LAruleno[state->lookaheadsp + j],
- tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]);
- else
- defaulted = 1;
-
- count++;
- }
- else
- {
- if (defaulted)
- 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],
- LAruleno[state->lookaheadsp + j],
- tags[rule_table[LAruleno[state->lookaheadsp + j]].lhs]);
- }
- }
- }
- }
-
- if (default_LA >= 0)
- fprintf (out, _(" $default\treduce using rule %d (%s)\n"),
- default_rule, tags[rule_table[default_rule].lhs]);
- }
-}
-
-
void
free_conflicts (void)
{
projects / bison.git / blobdiff