Disambiguation errors are no longer thrown away. They are now collected

[helm.git] / helm / matita / matitaExcPp.ml

diff --git a/helm/matita/matitaExcPp.ml b/helm/matita/matitaExcPp.ml
index adf35d92fb5d49107d8f9f68877d6858c54bb77e..a5a2f4d86a73a44772addd8852296e77aab03741 100644 (file)
--- a/helm/matita/matitaExcPp.ml
+++ b/helm/matita/matitaExcPp.ml
@@ -53,5 +53,18 @@ let to_string =
   | Continuationals.Error s -> "Tactical error: " ^ Lazy.force s
   | CicTypeChecker.TypeCheckerFailure msg ->
      "Type checking error: " ^ Lazy.force msg
+  | CicTypeChecker.AssertFailure msg ->
+     "Type checking assertion failed: " ^ Lazy.force msg
+  | MatitaDisambiguator.DisambiguationError errorll ->
+     let rec aux n =
+      function
+         [] -> ""
+       | phase::tl ->
+          aux (n+1) tl ^
+           "Errors obtained during phase " ^ string_of_int n ^":\n" ^
+            String.concat "\n" (List.map Lazy.force phase) ^ "\n" ^ "\n"
+     in
+      "DISAMBIGUATION ERROR:\n" ^
+       aux 1 errorll
   | exn -> "Uncaught exception: " ^ Printexc.to_string exn