X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e4d3d4de4c7ec15d84669d4157fdb77f681914e1..0df87bb6096b345a0a25714ee64c3a49596f2778:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a6bec6f1..1fde180b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-11-12  Akim Demaille  <akim@epita.fr>
+
+	* src/conflicts.c (count_sr_conflicts, count_rr_conflicts): Return
+	the result instead of using...
+	(src_total, rrc_total, src_count, rrc_count): Remove.
+	(any_conflicts): Remove.
+	(print_conflicts): Split into...
+	(conflicts_print, conflicts_output): New.
+	* src/conflicts.h: Adjust.
+	* src/main.c (main): Invoke both conflicts_output and conflicts_print.
+	* src/print.c (print_grammar): Issue `\n' between to rule outputs.
+	* tests/regression.at (Conflicts): New.
+	Reported by Tom Lane.
+
 2001-11-12  Akim Demaille  <akim@epita.fr>
 
 	* tests/regression.at (Invalid input): Remove, duplicate with