X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FmatitaExcPp.ml;h=42777735c2b96d4f9d4a6c2d26fb6783cf64417f;hb=84dbeab0a11aed6afb529b884bd796dec644c949;hp=a314556bd19dfbdca87c6fa1eede5e24bce14ee3;hpb=5e4deb64b7cae2df0a51425e3768ca316c297953;p=helm.git diff --git a/matita/matitaExcPp.ml b/matita/matitaExcPp.ml index a314556bd..42777735c 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 @@ -71,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 -> "" @@ -79,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 @@ -88,14 +92,11 @@ 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 - let flocb,floce = floc in - let floc = - {flocb with Lexing.pos_cnum = x}, {floce with Lexing.pos_cnum = y} - in + let floc = HExtlib.floc_of_loc (x,y) in Some floc | _ -> None in let rec explain =