Version 1.75f.

diff --git a/ChangeLog b/ChangeLog
index 3348b80f5e48954d643815d10c350e3547a67473..71845ef998b956b3ab6e835003414a0cafc3536c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2002-12-28  Paul Eggert  <eggert@twinsun.com>
+
+       Version 1.75f.
+
+       Switch back to the Yacc style of conflict reports, undoing some
+       of the 2002-07-30 change.
+       * doc/bison.texinfo (Understanding): Use Yacc style for
+       conflict reports.  Also, use new way of locating rules.
+       * src/conflicts.c (conflict_report):
+       Renamed from conflict_report_yacc, removing the old
+       'conflict_report'.  Translate the entire conflict report at once,
+       so that we don't assume that "," has the same interpretation in
+       all languages.
+       (conflicts_output): Use Yacc-style conflict report for each state,
+       instead of our more-complicated style.
+       (conflicts_print): Use Yacc-style conflict report, except print
+       the input file name when not emulating Yacc.
+       * tests/conflicts.at (Unresolved SR Conflicts, Defaulted
+       Conflicted Reduction, %expect not enough, %expect too much,
+       %expect with reduce conflicts): Switch to Yacc-style conflict reports.
+       * tests/existing.at (GNU Cim Grammar): Likewise.
+       * tests/glr-regr1.at (Badly Collapsed GLR States): Likewise.
+
+       * src/complain.c (warn_at, warn, complain_at, complain, fatal_at,
+       fatal): Don't invoke fflush; it's not needed and it might even be
+       harmful for stdout, as stdout might not be open.
+       * src/reduce.c (reduce_print): Likewise.
+
 2002-12-27  Paul Eggert  <eggert@twinsun.com>
 
        Fix a bug where error locations were not being recorded correctly.

diff --git a/NEWS b/NEWS
index 63ad026b52ef6e80553226d16155c7dfd885bc00..0407aad5ab66fde651f19972293fae05dbafe02d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,18 @@
 Bison News
 ----------
 
+Changes in version 1.75f, 2002-12-28:
+
+* In Yacc-style parsers YYLLOC_DEFAULT is now used to compute error
+  locations too.  This fixes bugs in error-location computation.
+
+* Bison now uses a Yacc-style format for conflict reports, e.g.,
+  "conflicts: 2 shift/reduce, 1 reduce/reduce".
+
+* Bison now warns if it detects conflicting outputs to the same file,
+  e.g., it generates a warning for "bison -d -o foo.h foo.y" since
+  that command outputs both code and header to foo.h.
+
 Changes in version 1.75e, 2002-12-24:
 
 * If the user does not define YYSTYPE as a macro, Bison now declares it