Fix %error-verbose for conflicts resolved by %nonassoc.

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index dc11d517d6ee2f427ab78f408e9d2f23d54726e0..6624a0ce32300d8ed2dfc11987edf46ee52e17c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-08-25  Joel E. Denny  <jdenny@clemson.edu>
+
+       Fix %error-verbose for conflicts resolved by %nonassoc.
+       * NEWS (2.5): Document.
+       * data/glr.c (yyreportSyntaxError): Fix this by checking
+       yyis_table_ninf.
+       * data/yacc.c (yysyntax_error): Likewise.
+       * data/lalr1.cc (yysyntax_error_): Fix this by checking
+       yytable_ninf_.
+       * data/lalr1.java (yysyntax_error): Likewise.
+       * tests/conflicts.at (%nonassoc and eof): Update expected output
+       and remove FIXME.
+
 2009-08-25  Joel E. Denny  <jdenny@clemson.edu>
 
        Some code and documentation improvements.