HUGE COMMIT:

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

diff --git a/matita/matita/matitaExcPp.ml b/matita/matita/matitaExcPp.ml
index ac1c23997b4b6166b908467a0ddf7a9a20d2ec08..5ecea5dc85af80a7058da057170fc92f53f01c47 100644 (file)
--- a/matita/matita/matitaExcPp.ml
+++ b/matita/matita/matitaExcPp.ml
@@ -147,13 +147,15 @@ let rec to_string =
      None, "NCicEnvironment object not found: " ^ Lazy.force msg
   | NCicEnvironment.AlreadyDefined msg ->
      None, "NCicEnvironment already defined: " ^ Lazy.force msg
+  | MatitaEngine.CircularDependency fname ->
+      None, "Circular dependency including " ^ fname
   | MatitaEngine.TryingToAdd msg ->
      None, "Attempt to insert an alias in batch mode: " ^ Lazy.force msg
   | MatitaEngine.AlreadyLoaded msg ->
      None, "The file " ^ Lazy.force msg ^ " needs recompilation but it is
      already loaded; undo the inclusion and try again."
   | MatitaEngine.FailureCompiling (filename,exn) ->
-     None, "Compiling " ^ filename ^ ": " ^ snd (to_string exn)
+     None, "Compiling " ^ filename ^ ":\n" ^ snd (to_string exn)
   | NCicRefiner.AssertFailure msg ->
      None, "NRefiner assert failure: " ^ Lazy.force msg
   | NCicEnvironment.BadDependency (msg,e) ->
@@ -168,7 +170,7 @@ let rec to_string =
   | DisambiguateChoices.Choice_not_found msg ->
      None, ("Disambiguation choice not found: " ^ Lazy.force msg)
   | MatitaEngine.EnrichedWithStatus (exn,_) ->
-     None, "EnrichedWithStatus "^snd(to_string exn)
+     None, snd(to_string exn)
   | NTacStatus.Error (msg,None) ->
      None, "NTactic error: " ^ Lazy.force msg 
   | NTacStatus.Error (msg,Some exn) ->