let alias_diff ~from status =
let module Map = DisambiguateTypes.Environment in
- Map.fold_flatten
- (fun domain_item codomain_item acc ->
- if not (Map.mem domain_item from.aliases) then
- Map.cons domain_item codomain_item acc
- else
- begin
- try
- let codomain1 = Map.find domain_item from.aliases in
- let codomain2 = Map.find domain_item status.aliases in
- List.fold_right
- (fun item env ->
- let dsc = fst item in
- if not (List.exists (fun (dsc', _) -> dsc'=dsc) codomain1) then
- Map.cons domain_item codomain_item env
- else
- env)
- codomain2 acc
- with Not_found -> acc
- end)
+ Map.fold
+ (fun domain_item (description1,_ as codomain_item) acc ->
+ try
+ let description2,_ = Map.find domain_item from.aliases in
+ if description1 <> description2 then
+ Map.add domain_item codomain_item acc
+ else
+ acc
+ with
+ Not_found ->
+ Map.add domain_item codomain_item acc)
status.aliases Map.empty
+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 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
new_status
else
let xmlbodypath = basedir ^ "/" ^ xmlbodyfilename in
xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri
+let acic_object_of_cic_object =
+ let profiler = CicUtil.profile "add_obj.save_object_to_disk.acic_object_of_cic_object" in
+ fun ~eta_fix obj ->
+ profiler.CicUtil.profile (Cic2acic.acic_object_of_cic_object ~eta_fix) obj
+
let save_object_to_disk status uri obj =
let ensure_path_exists path =
let dir = Filename.dirname path in
in
(* generate annobj, ids_to_inner_sorts and ids_to_inner_types *)
let annobj,_,_,ids_to_inner_sorts,ids_to_inner_types,_,_ =
- Cic2acic.acic_object_of_cic_object ~eta_fix:false obj
+ acic_object_of_cic_object ~eta_fix:false obj
in
(* prepare XML *)
let xml, bodyxml =
[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
- CicTypeChecker.typecheck_obj uri obj; (* 1 *)
+ typecheck_obj uri obj; (* 1 *)
try
- MetadataDb.index_obj ~dbd ~uri; (* 2 must be in the env *)
+ index_obj ~dbd ~uri; (* 2 must be in the env *)
try
let new_stuff = save_object_to_disk status uri obj in (* 3 *)
try
CicEnvironment.remove_obj uri; (* -1 *)
raise exc
end
+
+let add_obj =
+ let profiler = CicUtil.profile "add_obj" in
+ fun uri obj status -> profiler.CicUtil.profile (add_obj uri obj) status
module OrderedUri =
struct