Fix regression reported by Werner Lemberg in

<http://mail.gnu.org/archive/html/bug-bison/2003-04/msg00026.html>.

diff --git a/ChangeLog b/ChangeLog
index 268bb8a44bd37c462516016b40eba42762156214..e5bb37aa5304813f0e065d267cbde5967ed6dc29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-17  Paul Eggert  <eggert@twinsun.com>
+
+       * src/conflicts.c (set_conflicts): Resolve all conflicts, not just
+       the first one.  This change is from Paul Hilfinger, and it fixes
+       regression reported by Werner Lemberg in
+       <http://mail.gnu.org/archive/html/bug-bison/2003-04/msg00026.html>.
+
+       (resolve_sr_conflict): Don't invoke state_errs_set
+       unless one or more tokens have been explicitly made errors.
+       Otherwise, the above change causes Bison to abort.
+
+       * tests/existing.at (GNU pic Grammar): New test case, taken from
+       Lemberg's email.
+
 2003-03-31  Akim Demaille  <akim@epita.fr>
 
        * doc/Makefile.am (AM_MAKEINFOFLAGS): Don't split the info file.