) (acc,1) cl))),i+1
) ([],0) types)
-(** adds a (name,uri) list l to a disambiguation environment e **)
-let env_of_list l e =
- let module DT = DisambiguateTypes in
- let module DTE = DisambiguateTypes.Environment in
- List.fold_left (
- fun e (name,uri) ->
- DTE.add
- (DT.Id name)
- (uri,fun _ _ _ -> CicUtil.term_of_uri uri)
- e
- ) e l
-
-let add_aliases_for_object 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 env_of_list l env =
+ let l' = List.map (fun (name,suri) -> name,suri,CicUtil.term_of_uri 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
(* aliases for the constructors and types *)
) [] ["_ind.con";"_rec.con";"_rec_t.con"]) aliases
in
{status with aliases = aliases }
+*)
+
+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
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);
- let status = add_aliases_for_object status suri in
- { status with objects = new_stuff @ status.objects }
+ 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
-
-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 = add_aliases_for_inductive_def status types suri in
- 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 ())) ];
- end
-
-let add_record_def (suri, params, ty, fields) status =
- let module CTC = CicTypeChecker in
- let uri = UriManager.uri_of_string suri in
- let buri = UriManager.buri_of_uri uri in
- let record_spec = suri, params, ty, fields in
- let types, leftno, obj, ugraph = CicRecord.inductive_of_record record_spec in
- let status = add_inductive_def ~uri ~types ~leftno ~ugraph status in
- let projections = CicRecord.projections_of record_spec in
- let status =
- List.fold_left (
- fun status (suri, name, t) ->
- try
- let ty, ugraph =
- CTC.type_of_aux' [] [] t CicUniv.empty_ugraph
- in
- (* THIS MUST BE IN SYNC WITH CicRecord *)
- let uri = UriManager.uri_of_string suri in
- let t = Unshare.unshare t in
- let ty = Unshare.unshare ty in
- let status = add_constant ~uri ~body:t ~ty ~ugraph status in
- add_aliases_for_object status suri
- with
- | CTC.TypeCheckerFailure s ->
- MatitaLog.message
- ("Unable to create projection " ^ name ^ " cause: " ^ s);
- status
- | Http_getter_types.Key_not_found s ->
- let depend = UriManager.uri_of_string s in
- let depend = UriManager.name_of_uri depend in
- MatitaLog.message
- ("Unable to create projection " ^ name ^ " cause uses " ^ depend);
- status
- ) status projections
- in
- status
module OrderedUri =
struct
projects / helm.git / blobdiff