Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-21 02:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/state.h (SHIFT_DISABLE, SHIFT_IS_DISABLED): New.

Browse Source 
* src/conflicts.c: Use it.
Restore a few missing `if (!SHIFT_IS_DISABLED)' which were
incorrectly ``simplified''.
This commit is contained in:
Akim Demaille
2001-12-05 09:32:23 +00:00
parent 9f136c0720
commit 9839bbe557
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2001-12-05 Akim Demaille <akim@epita.fr>
* src/state.h (SHIFT_DISABLE, SHIFT_IS_DISABLED): New.
* src/conflicts.c: Use it.
Restore a few missing `if (!SHIFT_IS_DISABLED)' which were
incorrectly ``simplified''.
2001-12-05 Akim Demaille <akim@epita.fr> 2001-12-05 Akim Demaille <akim@epita.fr>
* src/conflicts.c (flush_shift, resolve_sr_conflict): De-obfuscate * src/conflicts.c (flush_shift, resolve_sr_conflict): De-obfuscate

28
src/conflicts.c
View File

@@ -62,8 +62,8 @@ flush_shift (int state, int token)
if (shiftp) if (shiftp)
for (i = 0; i < shiftp->nshifts; i++) for (i = 0; i < shiftp->nshifts; i++)
if (shiftp->shifts[i] && SHIFT_SYMBOL (shiftp, i) == token) if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token)
shiftp->shifts[i] = 0; SHIFT_DISABLE (shiftp, i);
} }
@@ -176,7 +176,8 @@ set_conflicts (int state)
shiftp = state_table[state].shift_table; shiftp = state_table[state].shift_table;
if (shiftp) if (shiftp)
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
SETBIT (lookaheadset, SHIFT_SYMBOL (shiftp, i)); if (!SHIFT_IS_DISABLED (shiftp, i))
SETBIT (lookaheadset, SHIFT_SYMBOL (shiftp, i));
/* Loop over all rules which require lookahead in this state. First /* Loop over all rules which require lookahead in this state. First
check for shift-reduce conflict, and try to resolve using check for shift-reduce conflict, and try to resolve using
@@ -245,7 +246,8 @@ count_sr_conflicts (int state)
} }
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i)); if (!SHIFT_IS_DISABLED (shiftp, i))
SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
for (i = state_table[state].lookaheads; for (i = state_table[state].lookaheads;
i < state_table[state + 1].lookaheads; i < state_table[state + 1].lookaheads;
@@ -436,13 +438,14 @@ print_reductions (FILE *out, int state)
shiftp = state_table[state].shift_table; shiftp = state_table[state].shift_table;
if (shiftp) if (shiftp)
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) 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 this state has a shift for the error token, don't use a
if (SHIFT_IS_ERROR (shiftp, i)) default rule. */
nodefault = 1; if (SHIFT_IS_ERROR (shiftp, i))
SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i)); nodefault = 1;
} SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
}
errp = err_table[state]; errp = err_table[state];
if (errp) if (errp)
@@ -506,7 +509,8 @@ print_reductions (FILE *out, int state)
if (shiftp) if (shiftp)
for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i)); if (!SHIFT_IS_DISABLED (shiftp, i))
SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
{ {

9
src/state.h
View File

@@ -146,6 +146,15 @@ typedef struct shifts
#define SHIFT_IS_ERROR(Shifts, Shift) \ #define SHIFT_IS_ERROR(Shifts, Shift) \
(SHIFT_SYMBOL (Shifts, Shift) == error_token_number) (SHIFT_SYMBOL (Shifts, Shift) == error_token_number)
/* When resolving a SR conflicts, if the reduction wins, the shift is
disabled. */
#define SHIFT_DISABLE(Shifts, Shift) \
(Shifts->shifts[Shift] = 0)
#define SHIFT_IS_DISABLED(Shifts, Shift) \
(Shifts->shifts[Shift] == 0)
/*-------. /*-------.
| Errs. | | Errs. |