try
let description2,_ = Map.find domain_item from.aliases in
if description1 <> description2 then
- Map.add domain_item codomain_item acc
+ (domain_item,codomain_item)::acc
else
acc
with
Not_found ->
- Map.add domain_item codomain_item acc)
- status.aliases Map.empty
+ (domain_item,codomain_item)::acc)
+ status.aliases []
let alias_diff =
- let profiler = CicUtil.profile "alias_diff (conteggiato anche in include)" in
- fun ~from status -> profiler.CicUtil.profile (alias_diff ~from) status
-
-let set_proof_aliases status aliases =
- let new_status = { status with aliases = aliases } in
- let diff = alias_diff ~from:status new_status in
+ let profiler = HExtlib.profile "alias_diff (conteggiato anche in include)" in
+ 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
let multi_aliases =
- DisambiguateTypes.Environment.fold DisambiguateTypes.Environment.cons
- diff status.multi_aliases in
- let new_status = { new_status with multi_aliases = multi_aliases } in
- if DisambiguateTypes.Environment.is_empty diff then
+ List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.cons d c acc)
+ status.multi_aliases new_aliases in
+ let new_status =
+ { status with multi_aliases = multi_aliases ; aliases = aliases}
+ in
+ if new_aliases = [] then
new_status
else
- add_moo_content (DisambiguatePp.commands_of_environment diff) 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) ->
- (name, UriManager.string_of_uri (UriManager.uri_of_uriref uri i None))
- ::
+ (name, UriManager.uri_of_uriref uri i None) ::
(fst(List.fold_left (
fun (acc,j) (name,_) ->
- (((name,UriManager.string_of_uri (UriManager.uri_of_uriref uri i
- (Some j))) :: acc) , j+1)
+ (((name,UriManager.uri_of_uriref uri i
+ (Some j)) :: acc) , j+1)
) (acc,1) cl)),i+1
) ([],0) types)
-let env_of_list l env =
- let l' = List.map (fun (name,suri) -> name,suri,CicUtil.term_of_uri (UriManager.uri_of_string suri)) l in
- DisambiguateTypes.env_of_list l' env
+let build_aliases =
+ List.map
+ (fun (name,uri) ->
+ DisambiguateTypes.Id name,
+ (UriManager.string_of_uri uri, fun _ _ _ -> CicUtil.term_of_uri uri))
-let add_aliases_for_inductive_def status types suri =
- let uri = UriManager.uri_of_string suri in
- let aliases = env_of_list (extract_alias types uri) status.aliases in
- set_proof_aliases status aliases
+let add_aliases_for_inductive_def status types uri =
+ let aliases = build_aliases (extract_alias types uri) in
+ set_proof_aliases status aliases
-let add_alias_for_constant status suri =
- let uri = UriManager.uri_of_string suri in
+let add_alias_for_constant status uri =
let name = UriManager.name_of_uri uri in
- let new_env = env_of_list [(name,suri)] status.aliases in
+ let new_env = build_aliases [(name,uri)] in
set_proof_aliases status new_env
-let add_aliases_for_object status suri =
+let add_aliases_for_object status uri =
function
Cic.InductiveDefinition (types,_,_,_) ->
- add_aliases_for_inductive_def status types suri
- | Cic.Constant _ -> add_alias_for_constant status suri
+ add_aliases_for_inductive_def status types uri
+ | Cic.Constant _ -> add_alias_for_constant status uri
| Cic.Variable _
| Cic.CurrentProof _ -> assert false
-let paths_and_uris_of_obj uri status =
- let basedir = get_string_option status "basedir" ^ "/xml" in
- let innertypesuri = UriManager.innertypesuri_of_uri uri in
- let bodyuri = UriManager.bodyuri_of_uri uri in
- let innertypesfilename = Str.replace_first (Str.regexp "^cic:") ""
- (UriManager.string_of_uri innertypesuri) ^ ".xml.gz" in
- let innertypespath = basedir ^ "/" ^ innertypesfilename in
- let xmlfilename = Str.replace_first (Str.regexp "^cic:/") ""
- (UriManager.string_of_uri uri) ^ ".xml.gz" in
- let xmlpath = basedir ^ "/" ^ xmlfilename in
- let xmlbodyfilename = Str.replace_first (Str.regexp "^cic:/") ""
- (UriManager.string_of_uri uri) ^ ".body.xml.gz" in
- let xmlbodypath = basedir ^ "/" ^ xmlbodyfilename in
- xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri
-
-let save_object_to_disk status uri obj =
- let ensure_path_exists path =
- let dir = Filename.dirname path in
- MatitaMisc.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
- (* prepare XML *)
- let xml, bodyxml =
- Cic2Xml.print_object
- uri ?ids_to_inner_sorts:None ~ask_dtd_to_the_getter:false annobj
- in
- let xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri =
- 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]);
- (* now write to disk *)
- ensure_path_exists xmlpath;
- Xml.pp ~gzip:true xml (Some xmlpath) ;
- (* we return a list of uri,path we registered/created *)
- (uri,xmlpath) ::
- (* now the optional body, both write and register *)
- (match bodyxml,bodyuri with
- None,None -> []
- | Some bodyxml,Some bodyuri->
- ensure_path_exists xmlbodypath;
- Xml.pp ~gzip:true bodyxml (Some xmlbodypath);
- [bodyuri, xmlbodypath]
- | _-> assert false)
-
-let typecheck_obj =
- let profiler = CicUtil.profile "add_obj.typecheck_obj" in
- fun uri obj -> profiler.CicUtil.profile (CicTypeChecker.typecheck_obj uri) obj
-
-let index_obj =
- let profiler = CicUtil.profile "add_obj.index_obj" in
- fun ~dbd ~uri ->
- profiler.CicUtil.profile (fun uri -> MetadataDb.index_obj ~dbd ~uri) uri
-
-let save_object_to_disk =
- let profiler = CicUtil.profile "add_obj.save_object_to_disk" in
- fun status uri obj ->
- profiler.CicUtil.profile (save_object_to_disk status uri) obj
-
let add_obj uri obj status =
- let dbd = MatitaDb.instance () in
- let suri = UriManager.string_of_uri uri in
- if CicEnvironment.in_library uri then
- command_error (sprintf "%s already defined" suri)
- else begin
- typecheck_obj uri obj; (* 1 *)
- try
- index_obj ~dbd ~uri; (* 2 must be in the env *)
- try
- let new_stuff = save_object_to_disk status uri obj in (* 3 *)
- try
- MatitaLog.message (sprintf "%s defined" suri);
- let status = add_aliases_for_object status suri obj in
- { status with objects = new_stuff @ status.objects;
- proof_status = No_proof }
- with exc ->
- List.iter MatitaMisc.safe_remove (List.map snd new_stuff); (* -3 *)
- raise exc
- with exc ->
- ignore(MatitaDb.remove_uri uri); (* -2 *)
- raise exc
- with exc ->
- CicEnvironment.remove_obj uri; (* -1 *)
- raise exc
- end
+ let basedir = Helm_registry.get "matita.basedir" in
+ let status =
+ { add_aliases_for_object status uri obj with proof_status = No_proof}
+ in
+ LibrarySync.add_obj uri obj basedir;
+ status
let add_obj =
- let profiler = CicUtil.profile "add_obj" in
- fun uri obj status -> profiler.CicUtil.profile (add_obj uri obj) status
+ let profiler = HExtlib.profile "add_obj" in
+ fun uri obj status -> profiler.HExtlib.profile (add_obj uri obj) status
module OrderedUri =
struct
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
let diff = S.diff s2 s1 in
S.fold (fun uri uris -> uri :: uris) diff []
-let remove_coercion uri =
- 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
+ (fun uri -> CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq u uri))
+ coercions_to_remove;
List.iter
(fun (uri,p) ->
- MatitaMisc.safe_remove p;
- remove_coercion uri;
+ HExtlib.safe_remove p;
(try
CicEnvironment.remove_obj uri
with CicEnvironment.Object_not_found _ ->
- MatitaLog.debug
+ HLog.debug
(sprintf "time_travel removes from cache %s that is not in"
(UriManager.string_of_uri uri)));
- let l = MatitaDb.remove_uri uri in
+ let l = LibraryDb.remove_uri uri in
debug_list := UriManager.string_of_uri uri :: !debug_list @ l)
objs_to_remove;
List.iter CicNotation.remove_notation notation_to_remove
List.iter2 (fun x y -> if x <> y then raise Exit) l1 l2
with
| Invalid_argument _ | Exit ->
- MatitaLog.debug "It seems you garbaged something...";
- MatitaLog.debug "l1:";
- List.iter MatitaLog.debug l1;
- MatitaLog.debug "l2:";
- List.iter MatitaLog.debug l2
+ HLog.debug "It seems you garbaged something...";
+ HLog.debug "l1:";
+ List.iter HLog.debug l1;
+ HLog.debug "l2:";
+ List.iter HLog.debug l2
*)
-
-let remove ~verbose uri =
- let derived_uris_of_uri uri =
- UriManager.innertypesuri_of_uri uri ::
- (match UriManager.bodyuri_of_uri uri with
- | None -> []
- | Some u -> [u])
- in
- let to_remove =
- uri ::
- (if UriManager.uri_is_ind uri then MatitaDb.xpointers_of_ind uri else []) @
- derived_uris_of_uri uri
- in
- List.iter
- (fun uri ->
- (try
- if verbose then
- MatitaLog.debug ("Removing: " ^ UriManager.string_of_uri uri);
- MatitaMisc.safe_remove (Http_getter.resolve' uri)
- with Http_getter_types.Key_not_found _ -> ());
- remove_coercion uri;
- ignore (MatitaDb.remove_uri uri);
- CicEnvironment.remove_obj uri)
- to_remove
projects / helm.git / blobdiff