open MatitaTypes
-let paths_and_uris_of_obj uri status =
- let basedir = get_string_option status "basedir" 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,_,_,ids_to_inner_sorts,ids_to_inner_types,_,_ =
- Cic2acic.acic_object_of_cic_object ~eta_fix:false obj
- in
- (* prepare XML *)
- let xml, bodyxml =
- Cic2Xml.print_object uri ~ids_to_inner_sorts ~ask_dtd_to_the_getter:false
- annobj
- in
- let xmlinnertypes =
- Cic2Xml.print_inner_types uri ~ids_to_inner_sorts ~ids_to_inner_types
- ~ask_dtd_to_the_getter:false
- 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 innertypespath;
- Xml.pp ~gzip:true xmlinnertypes (Some innertypespath) ;
- ensure_path_exists xmlpath;
- Xml.pp ~gzip:true xml (Some xmlpath) ;
- (* now register to the getter *)
- Http_getter.register' innertypesuri (path_scheme_of innertypespath);
- Http_getter.register' uri (path_scheme_of xmlpath);
- (* we return a list of uri,path we registered/created *)
- (uri,xmlpath) :: (innertypesuri,innertypespath) ::
- (* 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) ;
- Http_getter.register' bodyuri (path_scheme_of xmlbodypath);
- [bodyuri,xmlbodypath]
- | _-> assert false)
-
-let unregister_if_some = function
- | Some u -> Http_getter.unregister' u | None -> ()
-
-let remove_object_from_disk uri path =
- Sys.remove path;
- Http_getter.unregister' uri
-
-let add_constant ~uri ?body ~ty ~ugraph ?(params = []) ?(attrs = []) status =
- let dbd = MatitaDb.instance () in
- let suri = UriManager.string_of_uri uri in
- if CicEnvironment.in_library uri then
- command_error (sprintf "%s constant already defined" suri)
- else begin
- let name = UriManager.name_of_uri uri in
- let obj = Cic.Constant (name, body, ty, params, attrs) in
- let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in
- CicEnvironment.add_type_checked_term uri (obj, ugraph);
- MetadataDb.index_constant ~dbd ~uri ~body ~ty;
- let new_stuff = save_object_to_disk status uri obj in
- MatitaLog.message (sprintf "%s constant defined" suri);
- { status with objects = new_stuff @ status.objects }
- end
-
-let split_obj = function
- | Cic.Constant (name, body, ty, _, attrs)
- | Cic.Variable (name, body, ty, _, attrs) -> (name, body, ty, attrs)
- | _ -> assert false
-
-let add_inductive_def
- ~uri ~types ?(params = []) ?(leftno = 0) ?(attrs = []) ~ugraph status
-=
- let dbd = MatitaDb.instance () in
- let suri = UriManager.string_of_uri uri in
- if CicEnvironment.in_library uri then
- command_error (sprintf "%s inductive type already defined" suri)
- else begin
- let name = UriManager.name_of_uri uri in
- let obj = Cic.InductiveDefinition (types, params, leftno, attrs) in
- let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in
- CicEnvironment.put_inductive_definition uri (obj, ugraph);
- MetadataDb.index_inductive_def ~dbd ~uri ~types:types;
- let new_stuff = save_object_to_disk status uri obj in
- MatitaLog.message (sprintf "%s inductive type defined" suri);
- let status = { status with objects = new_stuff @ status.objects } in
- let elim sort status =
+let alias_diff ~from status =
+ let module Map = DisambiguateTypes.Environment in
+ Map.fold
+ (fun domain_item (description1,_ as codomain_item) acc ->
try
- let obj = CicElim.elim_of ~sort uri 0 in
- let (name, body, ty, attrs) = split_obj obj in
- let suri = MatitaMisc.qualify status name ^ ".con" in
- let uri = UriManager.uri_of_string suri in
- (* TODO Zack: make CicElim returns a universe *)
- let ugraph = CicUniv.empty_ugraph in
- add_constant ~uri ?body ~ty ~attrs ~ugraph status;
- with CicElim.Can_t_eliminate -> status
- in
- List.fold_left
- (fun status sort -> elim sort status)
- status
- [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ];
- end
+ let description2,_ = Map.find domain_item from.aliases in
+ if description1 <> description2 then
+ (domain_item,codomain_item)::acc
+ else
+ acc
+ with
+ Not_found ->
+ (domain_item,codomain_item)::acc)
+ status.aliases []
+
+let alias_diff =
+ 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 =
+ 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
+ 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 automatic aliases **)
+let extract_alias types uri =
+ fst(List.fold_left (
+ fun (acc,i) (name, _, _, cl) ->
+ (name, UriManager.uri_of_uriref uri i None) ::
+ (fst(List.fold_left (
+ fun (acc,j) (name,_) ->
+ (((name,UriManager.uri_of_uriref uri i
+ (Some j)) :: acc) , j+1)
+ ) (acc,1) cl)),i+1
+ ) ([],0) types)
+
+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 uri =
+ let aliases = build_aliases (extract_alias types uri) in
+ set_proof_aliases status aliases
+
+let add_alias_for_constant status uri =
+ let name = UriManager.name_of_uri uri in
+ let new_env = build_aliases [(name,uri)] in
+ set_proof_aliases status new_env
+
+let add_aliases_for_object status uri =
+ function
+ Cic.InductiveDefinition (types,_,_,_) ->
+ add_aliases_for_inductive_def status types uri
+ | Cic.Constant _ -> add_alias_for_constant status uri
+ | Cic.Variable _
+ | Cic.CurrentProof _ -> assert false
+let add_obj uri obj status =
+ 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 = HExtlib.profile "add_obj" in
+ fun uri obj status -> profiler.HExtlib.profile (add_obj uri obj) status
+
module OrderedUri =
struct
type t = UriManager.uri * string
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 urixstring_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 []
+
+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 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 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 = 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 (x,p) ->
- remove_object_from_disk x p;
- (try
- CicEnvironment.remove_obj x
- with CicEnvironment.Object_not_found _ ->
- MatitaLog.debug
- (sprintf "time_travel removes from cache %s that is not in"
- (UriManager.string_of_uri x)));
- let l = MatitaDb.remove_uri x in
- debug_list := UriManager.string_of_uri x :: !debug_list @ l)
- list_of_objs_to_remove;
-
+ List.iter
+ (fun uri -> CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq u uri))
+ coercions_to_remove;
+ List.iter
+ (fun (uri,p) ->
+ HExtlib.safe_remove p;
+ (try
+ CicEnvironment.remove_obj uri
+ with CicEnvironment.Object_not_found _ ->
+ HLog.debug
+ (sprintf "time_travel removes from cache %s that is not in"
+ (UriManager.string_of_uri uri)));
+ 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
+ (*
(* 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.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
-
-let alias_diff ~from status =
- let module Map = DisambiguateTypes.Environment in
- Map.fold
- (fun domain_item codomain_item acc ->
- if not (Map.mem domain_item from.aliases) then
- Map.add domain_item codomain_item acc
- else
- acc)
- status.aliases Map.empty
-
+ HLog.debug "It seems you garbaged something...";
+ HLog.debug "l1:";
+ List.iter HLog.debug l1;
+ HLog.debug "l2:";
+ List.iter HLog.debug l2
+ *)
projects / helm.git / blobdiff