- LexiconAst merged into GrafiteAst

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

diff --git a/matita/matita/matitaExcPp.ml b/matita/matita/matitaExcPp.ml
index 04bdd6a3871af183948a1a81e68c7dc83c2a3d21..a36a723ae6ca20a5781806ee2da6ef5edd0277a6 100644 (file)
--- a/matita/matita/matitaExcPp.ml
+++ b/matita/matita/matitaExcPp.ml
@@ -114,16 +114,15 @@ let compact_disambiguation_errors all_passes errorll =
 
 let rec to_string = 
   function
-  | HExtlib.Localized (floc,exn) ->
+    HExtlib.Localized (floc,exn) ->
       let _,msg = to_string exn in
       let (x, y) = HExtlib.loc_of_floc floc in
        Some floc, sprintf "Error at %d-%d: %s" x y msg
+  | NCicLibrary.IncludedFileNotCompiled (s1,s2) ->
+      None, "Including: "^s1^" "^s2^ "\nNothing to do... did you run matitadep?"
   | GrafiteTypes.Command_error msg -> None, "Error: " ^ msg
   | CicNotationParser.Parse_error err ->
       None, sprintf "Parse error: %s" err
-  | UriManager.IllFormedUri uri -> None, sprintf "invalid uri: %s" uri
-  | CicEnvironment.Object_not_found uri ->
-      None, sprintf "object not found: %s" (UriManager.string_of_uri uri)
   | Unix.Unix_error (code, api, param) ->
       let err = Unix.error_message code in
       None, "Unix Error (" ^ api ^ "): " ^ err
@@ -133,13 +132,7 @@ let rec to_string =
       None,
       sprintf "format/version mismatch for file '%s', please recompile it'"
         fname
-  | ProofEngineTypes.Fail msg -> None, "Tactic error: " ^ Lazy.force msg
   | Continuationals.Error s -> None, "Tactical error: " ^ Lazy.force s
-  | ProofEngineHelpers.Bad_pattern msg ->
-     None, "Bad pattern: " ^ Lazy.force msg
-  | CicRefine.RefineFailure msg
-  | CicRefine.AssertFailure msg ->
-     None, "Refiner error: " ^ Lazy.force msg
   | NCicRefiner.RefineFailure msg ->
      None, "NRefiner failure: " ^ snd (Lazy.force msg)
   | NCicRefiner.Uncertain msg ->
@@ -165,12 +158,6 @@ let rec to_string =
      None, "NCicUnification failure: " ^ Lazy.force msg
   | NCicUnification.Uncertain msg ->
      None, "NCicUnification uncertain: " ^ Lazy.force msg
-  | CicTypeChecker.TypeCheckerFailure msg ->
-     None, "Type checking error: " ^ Lazy.force msg
-  | CicTypeChecker.AssertFailure msg ->
-     None, "Type checking assertion failed: " ^ Lazy.force msg
-  | LibrarySync.AlreadyDefined s -> 
-     None, "Already defined: " ^ UriManager.string_of_uri s
   | DisambiguateChoices.Choice_not_found msg ->
      None, ("Disambiguation choice not found: " ^ Lazy.force msg)
   | MatitaEngine.EnrichedWithStatus (exn,_) ->