Big commit to let Ferruccio try the merge_coercion patch.

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

diff --git a/helm/matita/matitaExcPp.ml b/helm/matita/matitaExcPp.ml
index a5a2f4d86a73a44772addd8852296e77aab03741..c09b22fdd1c053127981cad7226a9968375e34af 100644 (file)
--- a/helm/matita/matitaExcPp.ml
+++ b/helm/matita/matitaExcPp.ml
@@ -25,46 +25,77 @@
 
 open Printf
 
-let to_string = 
+let rec to_string = 
   function
-  | MatitaTypes.Option_error ("baseuri", "not found" ) -> 
+  | 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
+  | GrafiteTypes.Option_error ("baseuri", "not found" ) -> 
+      None,
       "Baseuri not set for this script. "
       ^ "Use 'set \"baseuri\" \"<uri>\".' to set it."
-  | MatitaTypes.Command_error msg -> "Error: " ^ msg
-  | CicNotationParser.Parse_error (floc,err) ->
-      let (x, y) = CicNotationPt.loc_of_floc floc in
-      sprintf "Parse error at %d-%d: %s" x y err
-  | UriManager.IllFormedUri uri -> sprintf "invalid uri: %s" uri
+  | 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 ->
-      sprintf "object not found: %s" (UriManager.string_of_uri 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
-      "Unix Error (" ^ api ^ "): " ^ err
-  | MatitaMoo.Corrupt_moo fname ->
-      sprintf ".moo file '%s' is corrupt (shorter than expected)" fname
-  | MatitaMoo.Checksum_failure fname ->
-      sprintf "checksum failed for .moo file '%s', please recompile it'" fname
-  | MatitaMoo.Version_mismatch fname ->
+      None, "Unix Error (" ^ api ^ "): " ^ err
+  | GrafiteMarshal.Corrupt_moo fname ->
+      None, sprintf ".moo file '%s' is corrupt (shorter than expected)" fname
+  | GrafiteMarshal.Checksum_failure fname ->
+      None,
+       sprintf "checksum failed for .moo file '%s', please recompile it'" fname
+  | GrafiteMarshal.Version_mismatch fname ->
+      None,
       sprintf
         (".moo file '%s' has been compiled by a different version of matita, "
         ^^ "please recompile it")
         fname
-  | ProofEngineTypes.Fail msg -> "Tactic error: " ^ Lazy.force msg
-  | Continuationals.Error s -> "Tactical error: " ^ Lazy.force s
+  | ProofEngineTypes.Fail msg -> None, "Tactic error: " ^ Lazy.force msg
+  | Continuationals.Error s -> None, "Tactical error: " ^ Lazy.force s
   | CicTypeChecker.TypeCheckerFailure msg ->
-     "Type checking error: " ^ Lazy.force msg
+     None, "Type checking error: " ^ Lazy.force msg
   | CicTypeChecker.AssertFailure msg ->
-     "Type checking assertion failed: " ^ Lazy.force msg
-  | MatitaDisambiguator.DisambiguationError errorll ->
+     None, "Type checking assertion failed: " ^ Lazy.force msg
+  | LibrarySync.AlreadyDefined s -> 
+     None, "Already defined: " ^ UriManager.string_of_uri s
+  | MatitaDisambiguator.DisambiguationError (offset,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"
+           "***** Errors obtained during phase " ^ string_of_int n ^": *****\n"^
+            String.concat "\n\n"
+             (List.map (fun (floc,msg) ->
+               let loc_descr =
+                match floc with
+                   None -> ""
+                 | Some floc ->
+                    let (x, y) = HExtlib.loc_of_floc floc in
+                     sprintf " at %d-%d" (x+offset) (y+offset)
+               in
+                "*Error" ^ loc_descr ^ ": " ^ Lazy.force msg) phase) ^
+            "\n\n\n" in
+     let loc =
+      match errorll with
+         ((Some floc,_)::_)::_ ->
+          let (x, y) = HExtlib.loc_of_floc floc in
+          let x = x + offset in
+          let y = y + offset in
+          let flocb,floce = floc in
+          let floc =
+           {flocb with Lexing.pos_cnum = x}, {floce with Lexing.pos_cnum = y}
+          in
+           Some floc
+       | _ -> None
      in
-      "DISAMBIGUATION ERROR:\n" ^
-       aux 1 errorll
-  | exn -> "Uncaught exception: " ^ Printexc.to_string exn
+      loc,
+       "********** DISAMBIGUATION ERRORS: **********\n" ^
+        aux 1 errorll
+  | exn -> None, "Uncaught exception: " ^ Printexc.to_string exn