#include "reader.h"
#include "LR0.h"
-errs **err_table = NULL;
/* -1 stands for not specified. */
int expected_conflicts = -1;
static char *conflicts = NULL;
static void
flush_shift (int state, int token)
{
- shifts *shiftp = state_table[state].shift_table;
+ shifts *shiftp = state_table[state].shifts;
int i;
for (i = 0; i < shiftp->nshifts; i++)
short *errtokens = errp->errs;
for (i = 0; i < ntokens; 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"));
- /* 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. */
+ 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)
+ {
+ /* 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;
+ }
+ }
+ }
- 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;
- }
- }
- }
- }
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);
}
for (i = 0; i < tokensetsize; i++)
lookaheadset[i] = 0;
- shiftp = state_table[state].shift_table;
+ 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));
shiftset = XCALLOC (unsigned, tokensetsize);
lookaheadset = XCALLOC (unsigned, tokensetsize);
- err_table = XCALLOC (errs *, nstates);
-
for (i = 0; i < nstates; i++)
set_conflicts (i);
}
{
int i, k;
int src_count = 0;
- shifts *shiftp = state_table[state].shift_table;
+ shifts *shiftp = state_table[state].shifts;
if (!shiftp)
return 0;
int count = 0;
int j;
for (j = m; j < n; j++)
- if (BITISSET (LA (m), j))
+ if (BITISSET (LA (j), i))
count++;
if (count >= 2)
if (expected_conflicts != -1 && !src_ok)
{
- complain_message_count++;
+ /* FIXME: BIG ATTROCIOUS HACK. For flames, complaints and so
+ on, see Bruno Haible. GNU Gettext's plural.y's %expect is
+ wrong, and newer Bison reject it. But then, Bruno will be
+ overwhelmed by bug reports, until a fixed Gettext is
+ released. So for the 1.3x generation only, we leave a puke
+ puke hack. */
+ if (!strsuffix (infile, "plural.y"))
+ complain_message_count++;
fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n",
"expected %d shift/reduce conflicts\n",
expected_conflicts),
print_reductions (FILE *out, int state)
{
int i;
- int j;
int m;
int n;
shifts *shiftp;
for (i = 0; i < tokensetsize; i++)
shiftset[i] = 0;
- shiftp = state_table[state].shift_table;
+ 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 = err_table[state];
+ errp = state_table[state].errs;
if (errp)
for (i = 0; i < errp->nerrs; i++)
if (errp->errs[i])
}
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