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

* src/gram.h (rule_s): prec and precsym are now pointers

Browse Source 
to the bucket giving the priority/associativity.
Member `associativity' removed: useless.
* src/reduce.c, src/conflicts.c: Adjust.
This commit is contained in:
Akim Demaille
2002-04-07 17:42:31 +00:00
parent 8b3df748a3
commit 03b31c0ce8
6 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/conflicts.c
View File

@@ -1,5 +1,6 @@
/* Find and resolve or report look-ahead conflicts for bison,
Copyright 1984, 1989, 1992, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002
Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -97,7 +98,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
{
int i;
/* find the rule to reduce by to get precedence of reduction */
int redprec = LArule[lookahead]->prec;
int redprec = LArule[lookahead]->prec->prec;
errs *errp = errs_new (ntokens + 1);
errp->nerrs = 0;
@@ -175,6 +176,7 @@ set_conflicts (state_t *state)
precedence */
for (i = 0; i < state->nlookaheads; ++i)
if (LArule[state->lookaheadsp + i]->prec
&& LArule[state->lookaheadsp + i]->prec->prec
&& !bitset_disjoint_p (LA[state->lookaheadsp + i], lookaheadset))
{
resolve_sr_conflict (state, state->lookaheadsp + i);