* src/print.c (print_state): Separate the list of solved conflicts

from the other items.
* tests/conflicts.at (Resolved SR Conflicts): Adjust.

diff --git a/ChangeLog b/ChangeLog
index e9253f1d1ee9488f9a964ea92c2a600e6067ff0b..ed88848d6211f84d7699186f89850769f3dc3e67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-13  Akim Demaille  <akim@epita.fr>
+
+       * src/print.c (print_state): Separate the list of solved conflicts
+       from the other items.
+       * tests/conflicts.at (Resolved SR Conflicts): Adjust.
+
 2002-10-13  Akim Demaille  <akim@epita.fr>
 
        Let nondeterministic skeletons be usable with deterministic

diff --git a/src/print.c b/src/print.c
index 6fbe2c9a1ac31934ed24e6e3df63a445935d4d23..6e11dfb56e5c5494fbbd304d4fa051026816e14c 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -422,7 +422,10 @@ print_state (FILE *out, state_t *state)
   print_actions (out, state);
   if ((report_flag & report_solved_conflicts)
       && state->solved_conflicts)
-    fputs (state->solved_conflicts, out);
+    {
+      fputc ('\n', out);
+      fputs (state->solved_conflicts, out);
+    }
 }
 \f
 /*-----------------------------------------.

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 6f0a971f3ff66623a59db975228d861f3b4795bf..427cce376d8c942ce87a22d1ece665850d180969 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -328,6 +328,7 @@ state 5
     1    | exp OP exp .  [$end, OP]
 
     $default  reduce using rule 1 (exp)
+
     Conflict between rule 1 and token OP resolved as reduce (%left OP).
 ]])