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

* src/gram.h, src/gram.c (symbols): New, similar to state_table

Browse Source 
and rule_table.
* src/reader.c (packsymbols): Fill this table.
Drop sprec.
* src/conflicts.c (resolve_sr_conflict): Adjust.
* src/reduce.c (reduce_grammar): Adjust: just sort symbols, a
single table.
Use symbols[i]->tag instead of tags[i].
This commit is contained in:
Akim Demaille
2001-12-29 14:18:32 +00:00
parent 213e640e1e
commit 0e78e603f6
7 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/conflicts.c
View File

@@ -21,6 +21,7 @@
#include "system.h"
#include "complain.h"
#include "getargs.h"
#include "symtab.h"
#include "files.h"
#include "gram.h"
#include "state.h"
@@ -99,17 +100,17 @@ resolve_sr_conflict (state_t *state, int lookahead)
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);