X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaExcPp.ml;h=28f25fd5c53a0dd5c185fe3dac5696f5dcbd3046;hb=771ee8b9d122fa963881c876e86f90531bb7434f;hp=af1aeb882964661d01e722ef905fc3d681c2e545;hpb=9c5ffc85f9cac2ccf3176c72683f1d2c411c3951;p=helm.git diff --git a/helm/matita/matitaExcPp.ml b/helm/matita/matitaExcPp.ml index af1aeb882..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,7 +60,7 @@ 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]