[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
34-state-t-errs.patch
From: |
Akim Demaille |
Subject: |
34-state-t-errs.patch |
Date: |
Wed, 05 Dec 2001 08:26:52 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/conflicts.c (err_table): Remove.
(resolve_sr_conflict): Adjust.
* src/lalr.h (state_t.reduction_table, state_t.shift_table):
Rename as...
(state_t.reductions, state_t.shifts): this.
Index: src/print_graph.c
--- src/print_graph.c Sat, 01 Dec 2001 20:18:59 +0100 akim
+++ src/print_graph.c Tue, 04 Dec 2001 20:10:01 +0100 akim
@@ -85,8 +85,8 @@
{
int i;
- shifts *shiftp = state_table[state].shift_table;
- reductions *redp = state_table[state].reduction_table;
+ shifts *shiftp = state_table[state].shifts;
+ reductions *redp = state_table[state].reductions;
#if 0
errs *errp = err_table[state];
#endif
Index: src/conflicts.c
--- src/conflicts.c Sat, 01 Dec 2001 20:18:59 +0100 akim
+++ src/conflicts.c Tue, 04 Dec 2001 20:11:42 +0100 akim
@@ -29,7 +29,6 @@
#include "reader.h"
#include "LR0.h"
-errs **err_table = NULL;
/* -1 stands for not specified. */
int expected_conflicts = -1;
static char *conflicts = NULL;
@@ -57,7 +56,7 @@
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++)
@@ -83,79 +82,73 @@
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. */
-
- 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;
- }
- }
- }
- }
+ 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;
+
+ 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;
+ }
+ }
+ }
+
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);
}
@@ -172,7 +165,7 @@
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));
@@ -216,8 +209,6 @@
shiftset = XCALLOC (unsigned, tokensetsize);
lookaheadset = XCALLOC (unsigned, tokensetsize);
- err_table = XCALLOC (errs *, nstates);
-
for (i = 0; i < nstates; i++)
set_conflicts (i);
}
@@ -232,7 +223,7 @@
{
int i, k;
int src_count = 0;
- shifts *shiftp = state_table[state].shift_table;
+ shifts *shiftp = state_table[state].shifts;
if (!shiftp)
return 0;
@@ -433,7 +424,7 @@
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))
{
@@ -444,7 +435,7 @@
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])
Index: src/conflicts.h
--- src/conflicts.h Sat, 10 Nov 2001 13:45:46 +0100 akim
+++ src/conflicts.h Tue, 04 Dec 2001 20:11:54 +0100 akim
@@ -1,5 +1,5 @@
/* Find and resolve or report look-ahead conflicts for bison,
- Copyright 2000 Free Software Foundation, Inc.
+ Copyright 2000, 2001 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -29,6 +29,5 @@
void free_conflicts PARAMS ((void));
/* Were there conflicts? */
-extern errs **err_table;
extern int expected_conflicts;
#endif /* !CONFLICTS_H_ */
Index: src/lalr.c
--- src/lalr.c Sat, 01 Dec 2001 20:18:59 +0100 akim
+++ src/lalr.c Tue, 04 Dec 2001 20:10:01 +0100 akim
@@ -156,22 +156,22 @@
{
shifts *sp;
for (sp = first_shift; sp; sp = sp->next)
- state_table[sp->number].shift_table = sp;
+ state_table[sp->number].shifts = sp;
}
{
reductions *rp;
for (rp = first_reduction; rp; rp = rp->next)
- state_table[rp->number].reduction_table = rp;
+ state_table[rp->number].reductions = rp;
}
/* Pessimization, but simplification of the code: make sense all the
- states have a shift_table, even if reduced to 0 shifts. */
+ states have a shifts, even if reduced to 0 shifts. */
{
int i;
for (i = 0; i < nstates; i++)
- if (!state_table[i].shift_table)
- state_table[i].shift_table = shifts_new (0);
+ if (!state_table[i].shifts)
+ state_table[i].shifts = shifts_new (0);
}
/* Initializing the lookaheads members. Please note that it must be
@@ -183,8 +183,8 @@
for (i = 0; i < nstates; i++)
{
int k;
- reductions *rp = state_table[i].reduction_table;
- shifts *sp = state_table[i].shift_table;
+ reductions *rp = state_table[i].reductions;
+ shifts *sp = state_table[i].shifts;
state_table[i].lookaheads = count;
@@ -225,7 +225,7 @@
np = LAruleno;
for (i = 0; i < nstates; i++)
if (!state_table[i].consistent)
- if ((rp = state_table[i].reduction_table))
+ if ((rp = state_table[i].reductions))
for (j = 0; j < rp->nreds; j++)
*np++ = rp->rules[j];
}
@@ -340,13 +340,13 @@
for (i = 0; i < ngotos; i++)
{
int stateno = to_state[i];
- shifts *sp = state_table[stateno].shift_table;
+ shifts *sp = state_table[stateno].shifts;
int j;
for (j = 0; j < sp->nshifts && SHIFT_IS_SHIFT (sp, j); j++)
{
int symbol = state_table[sp->shifts[j]].accessing_symbol;
- SETBIT (F + i * tokensetsize, symbol);
+ SETBIT (F (i), symbol);
}
for (; j < sp->nshifts; j++)
@@ -515,7 +515,7 @@
for (rp = ritem + rule_table[*rulep].rhs; *rp > 0; rp++)
{
- shifts *sp = state_table[stateno].shift_table;
+ shifts *sp = state_table[stateno].shifts;
int j;
for (j = 0; j < sp->nshifts; j++)
{
Index: src/lalr.h
--- src/lalr.h Thu, 15 Nov 2001 23:53:01 +0100 akim
+++ src/lalr.h Tue, 04 Dec 2001 20:10:01 +0100 akim
@@ -78,8 +78,9 @@
/* Its accessing symbol. */
short accessing_symbol;
- shifts *shift_table;
- reductions *reduction_table;
+ shifts *shifts;
+ reductions *reductions;
+ errs *errs;
/* Nonzero if no lookahead is needed to decide what to do in state
S. */
Index: src/output.c
--- src/output.c Tue, 04 Dec 2001 13:51:26 +0100 akim
+++ src/output.c Tue, 04 Dec 2001 20:12:09 +0100 akim
@@ -541,7 +541,7 @@
default_rule = 0;
nreds = 0;
- redp = state_table[state].reduction_table;
+ redp = state_table[state].reductions;
if (redp)
{
@@ -568,7 +568,7 @@
/* Now see which tokens are allowed for shifts in this state. For
them, record the shift as the thing to do. So shift is preferred
to reduce. */
- shiftp = state_table[state].shift_table;
+ shiftp = state_table[state].shifts;
for (i = 0; i < shiftp->nshifts; i++)
{
shift_state = shiftp->shifts[i];
@@ -590,7 +590,7 @@
/* See which tokens are an explicit error in this state (due to
%nonassoc). For them, record MINSHORT as the action. */
- errp = err_table[state];
+ errp = state_table[state].errs;
if (errp)
{
Index: src/print.c
--- src/print.c Mon, 03 Dec 2001 21:58:14 +0100 akim
+++ src/print.c Tue, 04 Dec 2001 20:10:01 +0100 akim
@@ -98,9 +98,9 @@
{
int i;
- shifts *shiftp = state_table[state].shift_table;
- reductions *redp = state_table[state].reduction_table;
- errs *errp = err_table[state];
+ shifts *shiftp = state_table[state].shifts;
+ reductions *redp = state_table[state].reductions;
+ errs *errp = state_table[state].errs;
if (!shiftp->nshifts && !redp)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 34-state-t-errs.patch,
Akim Demaille <=