* src/conflicts.c (flush_shift): Also adjust lookaheadset.

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 2d624d78cd8da091b31564b9a3169b389c839aa9..30d62e867407795e9f7c11aaf9b0d668e32f0af0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-12-17  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (flush_shift): Also adjust lookaheadset.
+       (flush_reduce): New.
+       (resolve_sr_conflict): Adjust.
+
+       
+2001-12-17  Akim Demaille  <akim@epita.fr>
+
+       * src/output.c (output_obstack): Be static and rename as...
+       (format_obstack): this, to avoid any confusion with files.c's
+       output_obstack.
+       * src/reader.h (muscle_obstack): Move to...
+       * src/output.h: here, since it's defined in output.c.
+
+       
 2001-12-17  Akim Demaille  <akim@epita.fr>
 
        * src/output.c (action_row, save_column, default_goto)