X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FmatitaExcPp.ml;h=339971feaed0d33f73339bb3ce6e25244369cf48;hb=a3f4c0a8b4328cb9a9fe3b4c2e577be2a258675c;hp=ed0be49564d641e53743df560a337e7bf0e9181c;hpb=23655c60730b9b433483cd31f78381d6a6d8872c;p=helm.git diff --git a/matita/matitaExcPp.ml b/matita/matitaExcPp.ml index ed0be4956..339971fea 100644 --- a/matita/matitaExcPp.ml +++ b/matita/matitaExcPp.ml @@ -54,7 +54,10 @@ let rec to_string = fname | ProofEngineTypes.Fail msg -> None, "Tactic error: " ^ Lazy.force msg | Continuationals.Error s -> None, "Tactical error: " ^ Lazy.force s - | CicRefine.RefineFailure msg -> + | ProofEngineHelpers.Bad_pattern msg -> + None, "Bad pattern: " ^ Lazy.force msg + | CicRefine.RefineFailure msg + | CicRefine.AssertFailure msg -> None, "Refiner error: " ^ Lazy.force msg | CicTypeChecker.TypeCheckerFailure msg -> None, "Type checking error: " ^ Lazy.force msg @@ -62,6 +65,8 @@ let rec to_string = None, "Type checking assertion failed: " ^ Lazy.force msg | LibrarySync.AlreadyDefined s -> None, "Already defined: " ^ UriManager.string_of_uri s + | CoercDb.EqCarrNotImplemented msg -> + None, ("EqCarrNotImplemented: " ^ Lazy.force msg) | GrafiteDisambiguator.DisambiguationError (offset,errorll) -> let rec aux n ?(dummy=false) (prev_msg,phases) = function @@ -69,7 +74,7 @@ let rec to_string = | phase::tl -> let msg = String.concat "\n\n\n" - (List.map (fun (floc,msg) -> + (List.map (fun (_,_,floc,msg,significant) -> let loc_descr = match floc with None -> "" @@ -77,7 +82,8 @@ let rec to_string = 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) + "*" ^ (if not significant then "(Ignorable) " else "") + ^ "Error" ^ loc_descr ^ ": " ^ Lazy.force msg) phase) in if msg = prev_msg then aux (n+1) (msg,phases@[n]) tl @@ -86,7 +92,7 @@ let rec to_string = (aux (n+1) (msg,[n]) tl) in let loc = match errorll with - ((Some floc,_)::_)::_ -> + ((_,_,Some floc,_,_)::_)::_ -> let (x, y) = HExtlib.loc_of_floc floc in let x = x + offset in let y = y + offset in