open MatitaTypes
+(** given a uri and a type list (the contructors types) builds a list of pairs
+ * (name,uri) that is used to generate authomatic 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))
+ ::
+ (fst(List.fold_left (
+ fun (acc,j) (name,_) ->
+ (((name,UriManager.string_of_uri (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 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
+ {status with aliases = aliases }
+
+let add_alias_for_constant status suri =
+ let uri = UriManager.uri_of_string suri in
+ let name = UriManager.name_of_uri uri in
+ let new_env = env_of_list [(name,suri)] status.aliases in
+ {status with aliases = new_env }
+
+let add_aliases_for_object status suri =
+ function
+ Cic.InductiveDefinition (types,_,_,_) ->
+ add_aliases_for_inductive_def status types suri
+ | Cic.Constant _ -> add_alias_for_constant status suri
+ | Cic.Variable _
+ | Cic.CurrentProof _ -> assert false
+
let paths_and_uris_of_obj uri status =
let basedir = get_string_option status "basedir" in
let innertypesuri = UriManager.innertypesuri_of_uri uri in
[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 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 constant already defined" suri)
+ command_error (sprintf "%s 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);
+ 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 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_obj ~dbd ~uri; (* must be in the env *)
- 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 =
- 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 ())) ];
+ 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 }
end
-
+
module OrderedUri =
struct
type t = UriManager.uri * string
in
diff status1.objects status2.objects
+let remove_coercion uri =
+ CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq u uri)
+
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 debug_list = ref [] in
- List.iter (fun (x,p) ->
- remove_object_from_disk x p;
+ List.iter (fun (uri,p) ->
+ remove_object_from_disk uri p;
+ remove_coercion uri;
(try
- CicEnvironment.remove_obj x
+ 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 x)));
- let l = MatitaDb.remove_uri x in
- debug_list := UriManager.string_of_uri x :: !debug_list @ l)
+ (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;
(* this is debug code