X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FmatitaExcPp.ml;h=5134f403964195b9739ba6d22b4afa42dee1188f;hb=8aa44cb352041dd314011996b4b1a1ff8990a000;hp=ac1c23997b4b6166b908467a0ddf7a9a20d2ec08;hpb=d8c17db3c787f3ea964bbcd3b27427ca44b356d0;p=helm.git

diff --git a/matita/matita/matitaExcPp.ml b/matita/matita/matitaExcPp.ml
index ac1c23997..5134f4039 100644
--- 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) ->
@@ -167,8 +169,10 @@ let rec to_string =
      None, "NCicUnification uncertain: " ^ Lazy.force msg
   | DisambiguateChoices.Choice_not_found msg ->
      None, ("Disambiguation choice not found: " ^ Lazy.force msg)
+  | DisambiguateTypes.Invalid_choice msg ->
+     None, ("Invalid choice: " ^ snd (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) ->