X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaExcPp.ml;h=28f25fd5c53a0dd5c185fe3dac5696f5dcbd3046;hb=489ee5290cce2247291b8c5c53b98d493e7f6b99;hp=29f08d514980cdfea95218be2f06a7ebf400a1c3;hpb=585b70958440a8ae155e9ef8281099b66a9ba836;p=helm.git

diff --git a/helm/matita/matitaExcPp.ml b/helm/matita/matitaExcPp.ml
index 29f08d514..28f25fd5c 100644
--- a/helm/matita/matitaExcPp.ml
+++ b/helm/matita/matitaExcPp.ml
@@ -23,6 +23,8 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 let rec to_string = 
@@ -44,16 +46,11 @@ let rec to_string =
   | Unix.Unix_error (code, api, param) ->
       let err = Unix.error_message code in
       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 ->
+  | HMarshal.Corrupt_file fname -> None, sprintf "file '%s' is corrupt" fname
+  | HMarshal.Format_mismatch fname
+  | HMarshal.Version_mismatch fname ->
       None,
-      sprintf
-        (".moo file '%s' has been compiled by a different version of matita, "
-        ^^ "please recompile it")
+      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
@@ -63,10 +60,10 @@ let rec to_string =
      None, "Type checking assertion failed: " ^ Lazy.force msg
   | LibrarySync.AlreadyDefined s -> 
      None, "Already defined: " ^ UriManager.string_of_uri s
-  | MatitaDisambiguator.DisambiguationError (offset,errorll) ->
+  | GrafiteDisambiguator.DisambiguationError (offset,errorll) ->
      let rec aux n ?(dummy=false) (prev_msg,phases) =
       function
-         [] -> []
+         [] -> [prev_msg,phases]
        | phase::tl ->
           let msg =
            String.concat "\n\n\n"