From 318d9c9b415716dc1326963e9d3d6ba3c7118aa3 Mon Sep 17 00:00:00 2001
From: Nicolas Ojeda Bar <nicolas.ojeda.bar@lexifi.com>
Date: Tue, 5 Jul 2016 11:42:21 +0200
Subject: [PATCH] ocamlyacc: output verbose file before failing on --strict.

---
 yacc/main.c  | 1 +
 yacc/mkpar.c | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/yacc/main.c b/yacc/main.c
index 7882781c4..e7606dae4 100644
--- a/yacc/main.c
+++ b/yacc/main.c
@@ -462,6 +462,7 @@ int main(int argc, char **argv)
     lalr();
     make_parser();
     verbose();
+    if (eflag && SRtotal + RRtotal > 0) forbidden_conflicts();
     output();
     done(0);
     /*NOTREACHED*/
diff --git a/yacc/mkpar.c b/yacc/mkpar.c
index 8064f5b3b..79b2f928b 100644
--- a/yacc/mkpar.c
+++ b/yacc/mkpar.c
@@ -47,11 +47,7 @@ void make_parser(void)
     find_final_state();
     remove_conflicts();
     unused_rules();
-    if (SRtotal + RRtotal > 0) {
-        total_conflicts();
-        if (eflag)
-            forbidden_conflicts();
-    }
+    if (SRtotal + RRtotal > 0) total_conflicts();
     defreds();
 }