Merge fixes from Debian bison_1.34-1.diff.

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 28b21652633ce39e86e2945dcc85b7333b1174c3..224024cf9dc0c4be6692d9ec70ef6941c09a500d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2002-03-20  Paul Eggert  <eggert@twinsun.com>
+
+       Merge fixes from Debian bison_1.34-1.diff.
+
+       * configure.in (AC_PREREQ): 2.53.
+
+2002-03-20  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (log_resolution): Argument `resolution' is const.
+
+2002-03-19  Paul Eggert  <eggert@twinsun.com>
+
+       * src/bison.simple (YYCOPY): New macro.
+       (YYSTACK_RELOCATE): Use it.
+       Remove Type arg; no longer needed.  All callers changed.
+       (yymemcpy): Remove; no longer needed.
+
+       * Makefile.am (AUTOMAKE_OPTIONS): 1.6.
+       * doc/Makefile.am (AUTOMAKE_OPTIONS): Remove.
+
+2002-03-19  Akim Demaille  <akim@epita.fr>
+
+       Test and fix the #line outputs.
+
+       * tests/atlocal.at (GCC): New.
+       * tests/synclines.at (AT_TEST_SYNCLINE): New macro.
+       (Prologue synch line, ,%union synch line, Postprologue synch line)
+       (Action synch line, Epilogue synch line): New tests.
+       * src/reader.c (parse_union_decl): Define the muscle stype_line.
+       * data/bison.simple, data/bison.c++: Use it.
+
+
 2002-03-19  Akim Demaille  <akim@epita.fr>
 
        * tests/regression.at (%nonassoc and eof, Unresolved SR Conflicts)