From 7ea9a33f3b12c4fc2c5907dd22a74c1441d2855d Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Sun, 13 Oct 2002 19:35:59 +0000
Subject: [PATCH] * src/print.c (print_state): Separate the list of solved
conflicts from the other items. * tests/conflicts.at (Resolved SR Conflicts):
Adjust.
---
ChangeLog | 6 ++++++
src/print.c | 5 ++++-
tests/conflicts.at | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index e9253f1d..ed88848d 100644
--- 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 6fbe2c9a..6e11dfb5 100644
--- 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);
+ }
}
/*-----------------------------------------.
diff --git a/tests/conflicts.at b/tests/conflicts.at
index 6f0a971f..427cce37 100644
--- 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).
]])
--
2.47.2