X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2FcloseCoercionGraph.ml;h=2cff9c608b19816edc3d571beb92431203c1b63c;hb=58c0db9bcf83591115445a538bee028d3260fdf7;hp=898946ad64f6d89e77c0b18900644c55b0b8462c;hpb=32e29e1be132c4f9453787a194314ed57aa18538;p=helm.git diff --git a/helm/software/components/tactics/closeCoercionGraph.ml b/helm/software/components/tactics/closeCoercionGraph.ml index 898946ad6..2cff9c608 100644 --- a/helm/software/components/tactics/closeCoercionGraph.ml +++ b/helm/software/components/tactics/closeCoercionGraph.ml @@ -52,15 +52,20 @@ let get_closure_coercions src tgt uri coercions = coercions in (HExtlib.flatten_map - (fun (_,t,ul) -> List.map (fun u -> src,[uri; u],t) ul) c_from_tgt) @ + (fun (_,t,ul) -> + if CoercDb.eq_carr ~exact:true src t then [] else + List.map (fun u -> src,[uri; u],t) ul) c_from_tgt) @ (HExtlib.flatten_map - (fun (s,_,ul) -> List.map (fun u -> s,[u; uri],tgt) ul) c_to_src) @ + (fun (s,_,ul) -> + if CoercDb.eq_carr ~exact:true s tgt then [] else + List.map (fun u -> s,[u; uri],tgt) ul) c_to_src) @ (HExtlib.flatten_map (fun (s,_,u1l) -> HExtlib.flatten_map (fun (_,t,u2l) -> HExtlib.flatten_map (fun u1 -> + if CoercDb.eq_carr ~exact:true s t then [] else List.map (fun u2 -> (s,[u1;uri;u2],t)) u2l) @@ -316,8 +321,8 @@ let number_if_already_defined buri name l = if List.exists (UriManager.eq uri) l then retry () else try - let _ = Http_getter.resolve' ~writable:true uri in - if Http_getter.exists' uri then retry () else uri + let _ = Http_getter.resolve' ~local:true ~writable:true uri in + if Http_getter.exists' ~local:true uri then retry () else uri with | Http_getter_types.Key_not_found _ -> uri | Http_getter_types.Unresolvable_URI _ -> assert false @@ -357,8 +362,7 @@ let close_coercion_graph src tgt uri baseuri = [] [] univ arity true in if (menv = []) then - prerr_endline - "MENV non empty after composing coercions"; + HLog.warn "MENV non empty after composing coercions"; build_obj t univ arity | _ -> assert false ) (first_step, CicUniv.empty_ugraph) tl