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

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ec64bd63727d8e48c6cea584b752b5aeff075f9f..b61837f5eaa84112e26cba6f84343d178eb17948 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-06-15  Akim Demaille  <akim@epita.fr>
+
+       * 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.
+
+       
 2002-06-15  Akim Demaille  <akim@epita.fr>
 
        * src/state.h (state_t): Replace the `lookaheadsp' member, a