Change %merge result type clash warnings to errors. Discussed at

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index fb6297732700f14e20310a688a2e03d74918e090..c89138a7ed27f9634e6fe74f397699fadcdfe16d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-09  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Change %merge result type clash warnings to errors.  Discussed at
+       <http://lists.gnu.org/archive/html/bison-patches/2006-07/msg00026.html>.
+       * src/reader.c (record_merge_function_type): Use complain_at.
+       * tests/glr-regression.at (Missed %merge type warnings when LHS type is
+       declared later): Update test case results.
+
 2006-07-09  Akim Demaille  <akim@lrde.epita.fr>
 
        * src/getargs.h, src/getargs.c: Swap --report and --trace handling