* src/conflicts.c (log_resolution): Accept the rule involved in

the sr conflicts instead of the lookahead number that points to
that rule.
(flush_reduce): Accept the current lookahead vector as argument,
instead of the index in LA.
(resolve_sr_conflict): Accept the current number of lookahead
bitset to consider for the STATE, instead of the index in LA.
(set_conflicts): Adjust.
* src/lalr.c, src/lalr.h, src/state.h: Comment changes.
This commit is contained in:
Akim Demaille
2002-06-15 18:24:08 +00:00
parent c026349221
commit 9801d40c50
5 changed files with 53 additions and 31 deletions

View File

@@ -63,7 +63,7 @@ extern short *to_state;
extern rule_t **LArule;
/* LA is a lr by ntokens matrix of bits. LA[l, i] is 1 if the rule
/* LA is a LR by NTOKENS matrix of bits. LA[l, i] is 1 if the rule
LAruleno[l] is applicable in the appropriate state when the next
token is symbol i. If LA[l, i] and LA[l, j] are both 1 for i != j,
it is a conflict. */