if not (Map.mem domain_item from.aliases) then
Map.add domain_item codomain_item acc
else
- acc)
+ begin
+ try
+ let description1 = fst(Map.find domain_item from.aliases) in
+ let description2 = fst(Map.find domain_item status.aliases) in
+ if description1 <> description2 then
+ Map.add domain_item codomain_item acc
+ else
+ acc
+ with Not_found -> acc
+ end)
status.aliases Map.empty
let set_proof_aliases status aliases =
let new_status = {status with aliases = aliases } in
let diff = alias_diff ~from:status new_status in
- let moo_content_rev =
- CicTextualParser2.EnvironmentP3.to_string diff ::
- status.moo_content_rev in
+ let textual_diff =
+ if DisambiguateTypes.Environment.is_empty diff then
+ ""
+ else
+ DisambiguatePp.pp_environment diff ^ "\n" in
+ let moo_content_rev = textual_diff :: status.moo_content_rev in
{new_status with moo_content_rev = moo_content_rev}
(** given a uri and a type list (the contructors types) builds a list of pairs
| Cic.CurrentProof _ -> assert false
let paths_and_uris_of_obj uri status =
- let basedir = get_string_option status "basedir" in
+ 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:") ""
if CicEnvironment.in_library uri then
command_error (sprintf "%s already defined" suri)
else begin
- CicTypeChecker.typecheck_obj uri obj;
- MetadataDb.index_obj ~dbd ~uri; (* must be in the env *)
- let new_stuff = save_object_to_disk status uri obj in
- 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 }
+ CicTypeChecker.typecheck_obj uri obj; (* 1 *)
+ try
+ MetadataDb.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
module OrderedUri =
let compare (u1, _) (u2, _) = UriManager.compare u1 u2
end
+module OrderedId =
+struct
+ type t = CicNotation.notation_id
+ let compare = Pervasives.compare
+end
+
module UriSet = Set.Make (OrderedUri)
+module IdSet = Set.Make (OrderedId)
-(* returns the uri of objects that were added in the meanwhile...
- * status1 ----> status2
- * assumption: objects defined in status2 are a superset of those defined in
- * status1
- *)
-let delta_status status1 status2 =
+ (** @return l2 \ l1 *)
+let uri_list_diff l2 l1 =
let module S = UriSet in
- let diff l1 l2 =
- 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 []
- in
- diff status1.objects status2.objects
+ 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 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 remove_coercion uri =
CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq u uri)
-let safe_remove fname = if Sys.file_exists fname then Sys.remove fname
-
let time_travel ~present ~past =
- let list_of_objs_to_remove = List.rev (delta_status past present) in
- (* List.rev is just for the debugging code, which otherwise may list both
- * something.ind and something.ind#xpointer ... (ask Enrico :-) *)
+ let objs_to_remove = uri_list_diff present.objects past.objects in
+ let notation_to_remove =
+ id_list_diff present.notation_ids past.notation_ids
+ in
let debug_list = ref [] in
- List.iter (fun (uri,p) ->
- safe_remove p;
- remove_coercion uri;
- (try
- CicEnvironment.remove_obj uri
- with CicEnvironment.Object_not_found _ ->
- MatitaLog.debug
- (sprintf "time_travel removes from cache %s that is not in"
- (UriManager.string_of_uri uri)));
- let l = MatitaDb.remove_uri uri in
- debug_list := UriManager.string_of_uri uri :: !debug_list @ l)
- list_of_objs_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
+ (sprintf "time_travel removes from cache %s that is not in"
+ (UriManager.string_of_uri uri)));
+ let l = MatitaDb.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
+ (*
(* this is debug code
* idea: debug_list is the list of objects to be removed as computed from the
* db, while list_of_objs_to_remove is the same list but computer from the
List.iter MatitaLog.debug l1;
MatitaLog.debug "l2:";
List.iter MatitaLog.debug l2
+ *)
-let remove uri =
+let remove ~verbose uri =
let derived_uris_of_uri uri =
UriManager.innertypesuri_of_uri uri ::
(match UriManager.bodyuri_of_uri uri with
List.iter
(fun uri ->
(try
- MatitaLog.debug ("Removing: " ^ UriManager.string_of_uri uri);
- safe_remove (Http_getter.resolve' uri)
+ 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))
+ ignore (MatitaDb.remove_uri uri);
+ CicEnvironment.remove_obj uri)
to_remove
-
projects / helm.git / blobdiff