fun ~from status -> profiler.HExtlib.profile (alias_diff ~from) status
let set_proof_aliases status new_aliases =
+ let commands_of_aliases =
+ List.map
+ (fun alias -> GrafiteAst.Alias (DisambiguateTypes.dummy_floc, alias))
+ in
+ let deps_of_aliases =
+ HExtlib.filter_map
+ (function
+ | GrafiteAst.Ident_alias (_, suri) ->
+ let buri = UriManager.buri_of_uri (UriManager.uri_of_string suri) in
+ Some (GrafiteAst.Dependency buri)
+ | _ -> None)
+ in
let aliases =
List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.add d c acc)
status.aliases new_aliases in
if new_aliases = [] then
new_status
else
- add_moo_content
- (DisambiguatePp.commands_of_domain_and_codomain_items_list new_aliases)
- new_status
+ let aliases =
+ DisambiguatePp.aliases_of_domain_and_codomain_items_list new_aliases
+ in
+ let status = add_moo_content (commands_of_aliases aliases) new_status in
+ let status = add_moo_metadata (deps_of_aliases aliases) status in
+ status
(** given a uri and a type list (the contructors types) builds a list of pairs
- * (name,uri) that is used to generate authomatic aliases **)
+ * (name,uri) that is used to generate automatic aliases **)
let extract_alias types uri =
fst(List.fold_left (
fun (acc,i) (name, _, _, cl) ->
let save_object_to_disk status uri obj ugraph univlist =
let ensure_path_exists path =
let dir = Filename.dirname path in
- MatitaMisc.mkdir dir
+ HExtlib.mkdir dir
in
(* generate annobj, ids_to_inner_sorts and ids_to_inner_types *)
let annobj = Cic2acic.plain_acic_object_of_cic_object obj in
paths_and_uris_of_obj uri status
in
let path_scheme_of path = "file://" ^ path in
- List.iter MatitaMisc.mkdir
- (List.map Filename.dirname [innertypespath; xmlpath]);
+ List.iter HExtlib.mkdir (List.map Filename.dirname [xmlpath]);
(* now write to disk *)
ensure_path_exists xmlpath;
Xml.pp ~gzip:true xml (Some xmlpath);
CicUniv.write_xml_of_ugraph xmlunivgraphpath ugraph univlist;
(* we return a list of uri,path we registered/created *)
- (uri,xmlpath) :: (innertypesuri,innertypespath) ::
+ (uri,xmlpath) ::
(univgraphuri,xmlunivgraphpath) ::
(* now the optional body, both write and register *)
(match bodyxml,bodyuri with
module IdSet = Set.Make (OrderedId)
(** @return l2 \ l1 *)
-let uri_list_diff l2 l1 =
+let urixstring_list_diff l2 l1 =
let module S = UriSet in
let s1 = List.fold_left (fun set uri -> S.add uri set) S.empty l1 in
let s2 = List.fold_left (fun set uri -> S.add uri set) S.empty l2 in
let diff = S.diff s2 s1 in
S.fold (fun uri uris -> uri :: uris) diff []
+let uri_list_diff l2 l1 =
+ let module S = UriManager.UriSet in
+ let s1 = List.fold_left (fun set uri -> S.add uri set) S.empty l1 in
+ let s2 = List.fold_left (fun set uri -> S.add uri set) S.empty l2 in
+ let diff = S.diff s2 s1 in
+ S.fold (fun uri uris -> uri :: uris) diff []
+
(** @return l2 \ l1 *)
let id_list_diff l2 l1 =
let module S = IdSet in
CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq u uri)
let time_travel ~present ~past =
- let objs_to_remove = uri_list_diff present.objects past.objects in
+ let objs_to_remove = urixstring_list_diff present.objects past.objects in
+ let coercions_to_remove = uri_list_diff present.coercions past.coercions in
let notation_to_remove =
id_list_diff present.notation_ids past.notation_ids
in
let debug_list = ref [] in
+ List.iter remove_coercion coercions_to_remove;
List.iter
(fun (uri,p) ->
MatitaMisc.safe_remove p;
- remove_coercion uri;
(try
CicEnvironment.remove_obj uri
with CicEnvironment.Object_not_found _ ->
MatitaLog.debug ("Removing: " ^ baseuri ^ "/*");
last_baseuri := baseuri
end;
- MatitaMisc.safe_remove (Http_getter.resolve' uri)
+ let file = Http_getter.resolve' uri in
+ MatitaMisc.safe_remove file;
+ MatitaMisc.rmdir_descend (Filename.dirname file)
with Http_getter_types.Key_not_found _ -> ());
remove_coercion uri;
ignore (MatitaDb.remove_uri uri);