X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicEnvironment.ml;h=8014a19404d99da98716962b039b203ef559e97d;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=436474ea559f4485bf287797939aba872950c0bb;hpb=4fcebf318b866ce041b31d7ac4ddb0fdb29d098d;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicEnvironment.ml b/helm/ocaml/cic_proof_checking/cicEnvironment.ml index 436474ea5..8014a1940 100644 --- a/helm/ocaml/cic_proof_checking/cicEnvironment.ml +++ b/helm/ocaml/cic_proof_checking/cicEnvironment.ml @@ -35,18 +35,15 @@ (* *) (******************************************************************************) +let cleanup_tmp = true;; + +let trust_obj = function uri -> true;; + type type_checked_obj = CheckedObj of Cic.obj (* cooked obj *) | UncheckedObj of Cic.obj (* uncooked obj to proof-check *) ;; -exception NoFunctionProvided;; - -let cook_obj = ref (fun obj uri -> raise NoFunctionProvided);; - -let set_cooking_function foo = - cook_obj := foo -;; exception AlreadyCooked of string;; exception CircularDependency of string;; @@ -62,37 +59,196 @@ module Cache : UriManager.uri -> get_object_to_add:(unit -> Cic.obj) -> Cic.obj val unchecked_to_frozen : UriManager.uri -> unit val frozen_to_cooked : - uri:UriManager.uri -> - cooking_procedure: - (object_to_cook:Cic.obj -> - add_cooked:(UriManager.uri * int-> Cic.obj -> unit) - -> unit - ) - -> unit - val find_cooked : key:(UriManager.uri * int) -> Cic.obj + uri:UriManager.uri -> unit + val find_cooked : key:UriManager.uri -> Cic.obj + val add_cooked : key:UriManager.uri -> Cic.obj -> unit + + val dump_to_channel : ?callback:(string -> unit) -> out_channel -> unit + val restore_from_channel : ?callback:(string -> unit) -> in_channel -> unit + val empty : unit -> unit end = struct module CacheOfCookedObjects : sig - val mem : (UriManager.uri * int) -> bool - val find : (UriManager.uri * int) -> Cic.obj - val add : (UriManager.uri * int) -> Cic.obj -> unit + val mem : UriManager.uri -> bool + val find : UriManager.uri -> Cic.obj + val add : UriManager.uri -> Cic.obj -> unit + + (** (de)serialization of type checker cache *) + val dump_to_channel : ?callback:(string -> unit) -> out_channel -> unit + val restore_from_channel : ?callback:(string -> unit) -> in_channel -> unit + val empty : unit -> unit end = struct module HashedType = struct - type t = UriManager.uri * int (* uri, livello di cottura *) - let equal (u1,n1) (u2,n2) = UriManager.eq u1 u2 && n1 = n2 + type t = UriManager.uri + let equal = UriManager.eq let hash = Hashtbl.hash end ;; module HT = Hashtbl.Make(HashedType);; let hashtable = HT.create 1009;; - let mem = HT.mem hashtable;; - let find = HT.find hashtable;; - let add = HT.add hashtable;; + let mem uri = + try + HT.mem hashtable uri + with + Not_found -> false + ;; + let find uri = HT.find hashtable uri + ;; + let add uri obj = + HT.add hashtable uri obj + ;; + + (* used to hash cons uris on restore to grant URI structure unicity *) + let restore_uris = + let module C = Cic in + let recons uri = + UriManager.uri_of_string (UriManager.string_of_uri uri) + in + let rec restore_in_term = + function + (C.Rel _) as t -> t + | C.Var (uri,exp_named_subst) -> + let uri' = recons uri in + let exp_named_subst' = + List.map + (function (uri,t) ->(recons uri,restore_in_term t)) exp_named_subst + in + C.Var (uri',exp_named_subst') + | C.Meta (i,l) -> + let l' = + List.map + (function + None -> None + | Some t -> Some (restore_in_term t) + ) l + in + C.Meta(i,l') + | C.Sort _ as t -> t + | C.Implicit _ as t -> t + | C.Cast (te,ty) -> C.Cast (restore_in_term te, restore_in_term ty) + | C.Prod (n,s,t) -> C.Prod (n, restore_in_term s, restore_in_term t) + | C.Lambda (n,s,t) -> C.Lambda (n, restore_in_term s, restore_in_term t) + | C.LetIn (n,s,t) -> C.LetIn (n, restore_in_term s, restore_in_term t) + | C.Appl l -> C.Appl (List.map restore_in_term l) + | C.Const (uri,exp_named_subst) -> + let uri' = recons uri in + let exp_named_subst' = + List.map + (function (uri,t) -> (recons uri,restore_in_term t)) exp_named_subst + in + C.Const (uri',exp_named_subst') + | C.MutInd (uri,tyno,exp_named_subst) -> + let uri' = recons uri in + let exp_named_subst' = + List.map + (function (uri,t) -> (recons uri,restore_in_term t)) exp_named_subst + in + C.MutInd (uri',tyno,exp_named_subst') + | C.MutConstruct (uri,tyno,consno,exp_named_subst) -> + let uri' = recons uri in + let exp_named_subst' = + List.map + (function (uri,t) -> (recons uri,restore_in_term t)) exp_named_subst + in + C.MutConstruct (uri',tyno,consno,exp_named_subst') + | C.MutCase (uri,i,outty,t,pl) -> + C.MutCase (recons uri, i, restore_in_term outty, restore_in_term t, + List.map restore_in_term pl) + | C.Fix (i, fl) -> + let len = List.length fl in + let liftedfl = + List.map + (fun (name, i, ty, bo) -> + (name, i, restore_in_term ty, restore_in_term bo)) + fl + in + C.Fix (i, liftedfl) + | C.CoFix (i, fl) -> + let len = List.length fl in + let liftedfl = + List.map + (fun (name, ty, bo) -> (name, restore_in_term ty, restore_in_term bo)) + fl + in + C.CoFix (i, liftedfl) + in + function + C.Constant (name,bo,ty,params) -> + let bo' = + match bo with + None -> None + | Some bo -> Some (restore_in_term bo) + in + let ty' = restore_in_term ty in + let params' = List.map recons params in + C.Constant (name, bo', ty', params') + | C.CurrentProof (name,conjs,bo,ty,params) -> + let conjs' = + List.map + (function (i,hyps,ty) -> + (i, + List.map (function + None -> None + | Some (name,C.Decl t) -> + Some (name,C.Decl (restore_in_term t)) + | Some (name,C.Def (bo,ty)) -> + let ty' = + match ty with + None -> None + | Some ty'' -> Some (restore_in_term ty'') + in + Some (name,C.Def (restore_in_term bo, ty'))) hyps, + restore_in_term ty)) + conjs + in + let bo' = restore_in_term bo in + let ty' = restore_in_term ty in + let params' = List.map recons params in + C.CurrentProof (name, conjs', bo', ty', params') + | C.Variable (name,bo,ty,params) -> + let bo' = + match bo with + None -> None + | Some bo -> Some (restore_in_term bo) + in + let ty' = restore_in_term ty in + let params' = List.map recons params in + C.Variable (name, bo', ty', params') + | C.InductiveDefinition (tl,params,paramsno) -> + let params' = List.map recons params in + let tl' = + List.map (function (name, inductive, ty, constructors) -> + name, + inductive, + restore_in_term ty, + (List.map + (function (name, ty) -> name, restore_in_term ty) + constructors)) + tl + in + C.InductiveDefinition (tl', params', paramsno) + + let dump_to_channel ?(callback = ignore) oc = + HT.iter (fun uri _ -> callback (UriManager.string_of_uri uri)) hashtable; + Marshal.to_channel oc hashtable [] ;; + let empty () = HT.clear hashtable ;; + let restore_from_channel ?(callback = ignore) ic = + let restored = Marshal.from_channel ic in + empty (); + HT.iter + (fun k v -> + callback (UriManager.string_of_uri k); + HT.add hashtable + (UriManager.uri_of_string (UriManager.string_of_uri k)) + (restore_uris v)) + restored + ;; + end ;; let frozen_list = ref [];; @@ -106,7 +262,7 @@ module Cache : if List.mem_assq uri !frozen_list then raise (CircularDependency (UriManager.string_of_uri uri)) else - if CacheOfCookedObjects.mem (uri,0) then + if CacheOfCookedObjects.mem uri then raise (AlreadyCooked (UriManager.string_of_uri uri)) else (* OK, it is not already frozen nor cooked *) @@ -122,46 +278,63 @@ module Cache : with Not_found -> raise (CouldNotFreeze (UriManager.string_of_uri uri)) ;; - let frozen_to_cooked ~uri ~cooking_procedure = + let frozen_to_cooked ~uri = try let obj = List.assq uri !frozen_list in frozen_list := List.remove_assq uri !frozen_list ; - cooking_procedure ~object_to_cook:obj ~add_cooked:CacheOfCookedObjects.add + CacheOfCookedObjects.add uri obj with Not_found -> raise (CouldNotUnfreeze (UriManager.string_of_uri uri)) ;; - let find_cooked = CacheOfCookedObjects.find;; + let find_cooked ~key:uri = CacheOfCookedObjects.find uri;; + let add_cooked ~key:uri obj = CacheOfCookedObjects.add uri obj;; + + let dump_to_channel = CacheOfCookedObjects.dump_to_channel;; + let restore_from_channel = CacheOfCookedObjects.restore_from_channel;; + let empty = CacheOfCookedObjects.empty;; end ;; -(* get_cooked_obj uri *) -(* returns the cooked cic object whose uri is uri. The term must be present *) -(* and cooked in cache *) -let get_cooked_obj uri cookingsno = - Cache.find_cooked (uri,cookingsno) -;; +let dump_to_channel = Cache.dump_to_channel;; +let restore_from_channel = Cache.restore_from_channel;; +let empty = Cache.empty;; let find_or_add_unchecked_to_cache uri = Cache.find_or_add_unchecked uri ~get_object_to_add: (function () -> - let filename = Getter.getxml uri in - let obj = CicParser.obj_of_xml filename uri in + let filename = Http_getter.getxml' uri in + let bodyfilename = + match UriManager.bodyuri_of_uri uri with + None -> None + | Some bodyuri -> + try + ignore (Http_getter.resolve' bodyuri) ; + (* The body exists ==> it is not an axiom *) + Some (Http_getter.getxml' bodyuri) + with + Http_getter_types.Unresolvable_URI _ -> + (* The body does not exist ==> we consider it an axiom *) + None + in + let obj = CicParser.obj_of_xml filename bodyfilename in + if cleanup_tmp then + begin + Unix.unlink filename ; + match bodyfilename with + Some f -> Unix.unlink f + | None -> () + end ; obj ) ;; -(* get_obj uri *) -(* returns the cic object whose uri is uri. If the term is not just in cache, *) -(* then it is parsed via CicParser.term_of_xml from the file whose name is *) -(* the result of Getter.getxml uri *) -let get_obj uri = - try - get_cooked_obj uri 0 - with - Not_found -> - find_or_add_unchecked_to_cache uri -;; +(* set_type_checking_info uri *) +(* must be called once the type-checking of uri is finished *) +(* The object whose uri is uri is unfreezed *) +let set_type_checking_info uri = + Cache.frozen_to_cooked uri +;; (* is_type_checked uri *) (* CSC: commento falso ed obsoleto *) @@ -169,39 +342,66 @@ let get_obj uri = (* otherwise it freezes the term for type-checking and returns it *) (* set_type_checking_info must be called to unfreeze the term *) -let is_type_checked uri cookingsno = +let is_type_checked ?(trust=true) uri = try - CheckedObj (Cache.find_cooked (uri,cookingsno)) + CheckedObj (Cache.find_cooked uri) with Not_found -> let obj = find_or_add_unchecked_to_cache uri in Cache.unchecked_to_frozen uri ; - UncheckedObj obj + if trust && trust_obj uri then + begin + CicLogger.log (`Trusting uri) ; + set_type_checking_info uri ; + CheckedObj (Cache.find_cooked uri) + end + else + UncheckedObj obj ;; -(* set_type_checking_info uri *) -(* must be called once the type-checking of uri is finished *) -(* The object whose uri is uri is unfreezed *) -let set_type_checking_info uri = - Cache.frozen_to_cooked uri - (fun ~object_to_cook:obj ~add_cooked -> - (* let's cook the object at every level *) - let obj' = CicSubstitution.undebrujin_inductive_def uri obj in - add_cooked (uri,0) obj' ; - let cooked_objs = !cook_obj obj' uri in - let last_cooked_level = ref 0 in - let last_cooked_obj = ref obj' in - List.iter - (fun (n,cobj) -> - for i = !last_cooked_level + 1 to n do - add_cooked (uri,i) !last_cooked_obj - done ; - add_cooked (uri,n + 1) cobj ; - last_cooked_level := n + 1 ; - last_cooked_obj := cobj - ) cooked_objs ; - for i = !last_cooked_level + 1 to UriManager.depth_of_uri uri + 1 do - add_cooked (uri,i) !last_cooked_obj - done - ) +(* get_cooked_obj ~trust uri *) +(* returns the object if it is already type-checked or if it can be *) +(* trusted (if [trust] = true and the trusting function accepts it) *) +(* Otherwise it raises Not_found *) +let get_cooked_obj ?(trust=true) uri = + try + Cache.find_cooked uri + with Not_found -> + if trust && trust_obj uri then + begin + match is_type_checked uri with + CheckedObj obj -> obj + | _ -> assert false + end + else + begin + prerr_endline ("@@@ OOOOOOOPS: get_cooked_obj(" ^ UriManager.string_of_uri uri ^ ") raises Not_found since the object is not type-checked nor trusted.") ; + raise Not_found + end +;; + +(* get_obj uri *) +(* returns the cic object whose uri is uri. If the term is not just in cache, *) +(* then it is parsed via CicParser.term_of_xml from the file whose name is *) +(* the result of Getter.getxml uri *) +let get_obj uri = + try + get_cooked_obj uri + with + Not_found -> + find_or_add_unchecked_to_cache uri +;; + +exception OnlyPutOfInductiveDefinitionsIsAllowed + +let put_inductive_definition uri obj = + match obj with + Cic.InductiveDefinition _ -> Cache.add_cooked uri obj + | _ -> raise OnlyPutOfInductiveDefinitionsIsAllowed +;; + +let in_cache uri = + try + ignore (Cache.find_cooked uri);true + with Not_found -> false ;;