[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05-print-conflicts.patch
From: |
Akim Demaille |
Subject: |
05-print-conflicts.patch |
Date: |
Sun, 13 Oct 2002 21:37:27 +0200 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/print.c (print_state): Separate the list of solved conflicts
from the other items.
* tests/conflicts.at (Resolved SR Conflicts): Adjust.
Index: src/print.c
--- src/print.c Fri, 02 Aug 2002 09:46:40 +0200 akim
+++ src/print.c Sun, 13 Oct 2002 21:03:45 +0200 akim
@@ -422,7 +422,10 @@
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);
+ }
}
/*-----------------------------------------.
Index: tests/conflicts.at
--- tests/conflicts.at Fri, 02 Aug 2002 09:46:40 +0200 akim
+++ tests/conflicts.at Sun, 13 Oct 2002 21:05:01 +0200 akim
@@ -328,6 +328,7 @@ exp: exp OP exp | NUM;
1 | exp OP exp . [$end, OP]
$default reduce using rule 1 (exp)
+
Conflict between rule 1 and token OP resolved as reduce (%left OP).
]])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 05-print-conflicts.patch,
Akim Demaille <=