X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicEnvironment.ml;h=1f2c6be0e1704662c2c92fa46c51eb43a118c004;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=b7dda108592449434fccc60d601b572acf49e806;hpb=316aca76611f6b909e0c53a50362e79a5336e474;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicEnvironment.ml b/helm/ocaml/cic_proof_checking/cicEnvironment.ml index b7dda1085..1f2c6be0e 100644 --- a/helm/ocaml/cic_proof_checking/cicEnvironment.ml +++ b/helm/ocaml/cic_proof_checking/cicEnvironment.ml @@ -44,7 +44,7 @@ let cleanup_tmp = true;; let trust = ref (fun _ -> true);; let set_trust f = trust := f let trust_obj uri = !trust uri - +let debug_print = fun _ -> () (* ************************************************************************** * TYPES @@ -59,7 +59,7 @@ exception AlreadyCooked of string;; exception CircularDependency of string;; exception CouldNotFreeze of string;; exception CouldNotUnfreeze of string;; -exception Term_not_found of UriManager.uri;; +exception Object_not_found of UriManager.uri;; (* ************************************************************************** * @@ -99,6 +99,7 @@ module Cache : val is_in_frozen: UriManager.uri -> bool val is_in_unchecked: UriManager.uri -> bool val is_in_cooked: UriManager.uri -> bool + val list_all_cooked_uris: unit -> UriManager.uri list end = struct @@ -164,6 +165,9 @@ module Cache : ) l in C.Meta(i,l') + | C.Sort (C.Type u) -> + CicUniv.assert_univ u; + C.Sort (C.Type (CicUniv.recons_univ u)) | C.Sort _ as t -> t | C.Implicit _ as t -> t | C.Cast (te,ty) -> C.Cast (restore_in_term te, restore_in_term ty) @@ -213,8 +217,8 @@ module Cache : in C.CoFix (i, liftedfl) in - function - C.Constant (name,bo,ty,params) -> + function + C.Constant (name,bo,ty,params,attrs) -> let bo' = match bo with None -> None @@ -222,8 +226,8 @@ module Cache : 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) -> + C.Constant (name, bo', ty', params',attrs) + | C.CurrentProof (name,conjs,bo,ty,params,attrs) -> let conjs' = List.map (function (i,hyps,ty) -> @@ -245,8 +249,8 @@ module Cache : 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) -> + C.CurrentProof (name, conjs', bo', ty', params',attrs) + | C.Variable (name,bo,ty,params,attrs) -> let bo' = match bo with None -> None @@ -254,8 +258,8 @@ module Cache : 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) -> + C.Variable (name, bo', ty', params',attrs) + | C.InductiveDefinition (tl,params,paramsno,attrs) -> let params' = List.map recons params in let tl' = List.map (function (name, inductive, ty, constructors) -> @@ -267,7 +271,7 @@ module Cache : constructors)) tl in - C.InductiveDefinition (tl', params', paramsno) + C.InductiveDefinition (tl', params', paramsno, attrs) ;; let empty () = @@ -291,14 +295,14 @@ module Cache : *) empty (); HT.iter - (fun k v -> + (fun k (v,u) -> callback (UriManager.string_of_uri k); HT.add cacheOfCookedObjects (UriManager.uri_of_string (UriManager.string_of_uri k)) (*********************************************** TSSI: FIXME add channel stuff for universes ************************************************) - ((restore_uris v),CicUniv.empty_ugraph)) + (restore_uris v, CicUniv.recons_graph u)) restored ;; @@ -319,7 +323,7 @@ module Cache : (******************************************************************* TASSI: invariant we need, in the universe generation phase, to traverse objects - that are not jet committed, so we search them in the frozen list. + that are not yet committed, so we search them in the frozen list. Only uncommitted objects without a universe file (see the assertion) can be searched with method *******************************************************************) @@ -392,6 +396,7 @@ module Cache : None -> assert false (* only NON dummy universes can be committed *) | Some g -> + CicUniv.assert_univs_have_uri g; frozen_list := List.remove_assq uri !frozen_list ; HT.add cacheOfCookedObjects uri (obj,g) with @@ -425,14 +430,14 @@ module Cache : frozen_list := List.remove_assoc uri !frozen_list; frozen_list := (uri,(o,Some real_ugraph))::!frozen_list; | Some g -> - prerr_endline ( + debug_print ( "You are probably hacking an object already hacked or an"^ " object that has the universe file but is not"^ " yet committed."); assert false with Not_found -> - prerr_endline ( + debug_print ( "You are hacking an object that is not in the"^ " frozen_list, this means you are probably generating an"^ " universe file for an object that already"^ @@ -452,12 +457,16 @@ module Cache : * something. this means check and frozen must be empty. *) let remove uri = - if (!unchecked_list <> []) || (!frozen_list <> []) then + if !frozen_list <> [] then failwith "CicEnvironment.remove while type checking" else HT.remove cacheOfCookedObjects uri ;; + let list_all_cooked_uris () = + HT.fold (fun u _ l -> u::l) cacheOfCookedObjects [] + ;; + end ;; @@ -470,69 +479,58 @@ let dump_to_channel = Cache.dump_to_channel;; let restore_from_channel = Cache.restore_from_channel;; let empty = Cache.empty;; +let total_parsing_time = ref 0.0 + let get_object_to_add uri = - 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.Key_not_found _ -> - (* The body does not exist ==> we consider it an axiom *) - None - in - let cleanup () = - Unix.unlink filename ; - (* - begin - match filename_univ with - Some f -> Unix.unlink f - | None -> () - end; - *) - begin - match bodyfilename with - Some f -> Unix.unlink f - | None -> () - end - in - (* this brakes something : - * let _ = CicUniv.restart_numbering () in - *) - let obj = - try - CicParser.obj_of_xml filename bodyfilename - with exn -> - cleanup (); - raise exn - in - let ugraph,filename_univ = + try + let filename = Http_getter.getxml' uri in + let bodyfilename = + match UriManager.bodyuri_of_uri uri with + None -> None + | Some bodyuri -> + if Http_getter.exists' bodyuri then + Some (Http_getter.getxml' bodyuri) + else + None + in + (* restarts the numbering of named universes (the ones inside the cic) *) + let _ = CicUniv.restart_numbering () in + let obj = + try + let time = Unix.gettimeofday() in + let rc = CicParser.obj_of_xml uri filename bodyfilename in + total_parsing_time := + !total_parsing_time +. ((Unix.gettimeofday()) -. time ); + rc + with exn -> + (match exn with + | CicParser.Getter_failure ("key_not_found", uri) -> + raise (Object_not_found (UriManager.uri_of_string uri)) + | _ -> raise exn) + in + let ugraph,filename_univ = (* FIXME: decomment this when the universes will be part of the library - try - let filename_univ = - Http_getter.getxml' ( - UriManager.uri_of_string ( - (UriManager.string_of_uri uri) ^ ".univ")) - in - (Some (CicUniv.ugraph_of_xml filename_univ),Some filename_univ) - with Failure s -> - - prerr_endline ( - "WE HAVE NO UNIVERSE FILE FOR " ^ (UriManager.string_of_uri uri)); - Inix.unlink - None,None - *) - (********************************************** - TASSI: should fail when universes will be ON - ***********************************************) - (Some CicUniv.empty_ugraph,None) - in - cleanup(); - obj,ugraph + try + let filename_univ = + Http_getter.getxml' ( + UriManager.uri_of_string ( + (UriManager.string_of_uri uri) ^ ".univ")) + in + (Some (CicUniv.ugraph_of_xml filename_univ),Some filename_univ) + with Failure s -> + + debug_print ( + "WE HAVE NO UNIVERSE FILE FOR " ^ (UriManager.string_of_uri uri)); + Inix.unlink + None,None + *) + (********************************************** + TASSI: should fail when universes will be ON + ***********************************************) + (Some CicUniv.empty_ugraph,None) + in + obj,ugraph + with Http_getter_types.Key_not_found _ -> raise (Object_not_found uri) ;; (* this is the function to fetch the object in the unchecked list and @@ -548,23 +546,29 @@ let find_or_add_to_unchecked uri = (* the replacement ugraph must be the one returned by the *) (* typechecker, restricted with the CicUnivUtils.clean_and_fill *) let set_type_checking_info ?(replace_ugraph=None) uri = - if Cache.can_be_cooked uri && replace_ugraph <> None then - invalid_arg ( +(* + if not (Cache.can_be_cooked uri) && replace_ugraph <> None then begin + debug_print ( "?replace_ugraph must be None if you are not committing an "^ "object that has a universe graph associated "^ "(can happen only in the fase of universes graphs generation)."); - if not (Cache.can_be_cooked uri) && replace_ugraph = None then - invalid_arg ( - "?replace_ugraph must be (Some ugraph) when committing an object that "^ - "has no associated universe graph. If this is in make_univ phase you "^ - "should drop this exception and let univ_make commit thi object with "^ - "proper arguments"); - begin - match replace_ugraph with - None -> () - | Some g -> Cache.hack_univ uri g - end; - Cache.frozen_to_cooked uri + assert false + else +*) + match Cache.can_be_cooked uri, replace_ugraph with + | true, Some _ + | false, None -> + debug_print ( + "?replace_ugraph must be (Some ugraph) when committing an object that "^ + "has no associated universe graph. If this is in make_univ phase you "^ + "should drop this exception and let univ_make commit thi object with "^ + "proper arguments"); + assert false + | _ -> + (match replace_ugraph with + | None -> () + | Some g -> Cache.hack_univ uri g); + Cache.frozen_to_cooked uri ;; (* fetch, unfreeze and commit an uri to the cacheOfCookedObjects and @@ -594,7 +598,7 @@ let get_cooked_obj ?(trust=true) base_univ uri = else (* we don't trust the uri, so we fail *) begin - prerr_endline ("CACHE MISS: " ^ (UriManager.string_of_uri uri)); + debug_print ("CACHE MISS: " ^ (UriManager.string_of_uri uri)); raise Not_found end @@ -624,6 +628,7 @@ let is_type_checked ?(trust=true) base_univ uri = CheckedObj ( o, CicUniv.merge_ugraphs u base_univ ) else let o,u = find_or_add_to_unchecked uri in + Cache.unchecked_to_frozen uri; UncheckedObj o ;; @@ -637,42 +642,32 @@ let get_obj base_univ uri = o,(CicUniv.merge_ugraphs base_univ u) with Not_found -> (* this should be an error case, but if we trust the uri... *) - if trust_obj uri then - (* trusting we add it to the unchecked list *) let o,u = find_or_add_to_unchecked uri in o,(CicUniv.merge_ugraphs base_univ u) - else - raise Not_found ;; -exception OnlyPutOfInductiveDefinitionsIsAllowed +let in_cache uri = + Cache.is_in_cooked uri || Cache.is_in_frozen uri || Cache.is_in_unchecked uri -let put_inductive_definition uri (obj,ugraph) = - match obj with - Cic.InductiveDefinition _ -> Cache.add_cooked uri (obj,ugraph) - | _ -> raise OnlyPutOfInductiveDefinitionsIsAllowed -;; +let add_type_checked_obj uri (obj,ugraph) = + Cache.add_cooked ~key:uri (obj,ugraph) -let in_cache uri = - if Cache.is_in_cooked uri then - (prerr_endline "TROVATO NELLA CHECKED";true) - else - if Cache.is_in_frozen uri then - (prerr_endline "TROVATO NELLA FROZEN";true) - else - if Cache.is_in_unchecked uri then - (prerr_endline "TROVATO NELLA UNCHECKED";true) - else - (prerr_endline ("NON TROVATO:" ^ (UriManager.string_of_uri uri) );false) -;; +let in_library uri = in_cache uri || Http_getter.exists' uri -let add_type_checked_term uri (obj,ugraph) = - match obj with - Cic.Constant (s,(Some bo),ty,ul) -> - Cache.add_cooked ~key:uri (obj,ugraph) - | _ -> - assert false +let remove_obj = Cache.remove + +let list_uri () = + Cache.list_all_cooked_uris () ;; -let remove_term = Cache.remove - +let list_obj () = + try + List.map (fun u -> + let o,ug = get_obj CicUniv.empty_ugraph u in + (u,o,ug)) + (list_uri ()) + with + Not_found -> + debug_print "Who has removed the uri in the meanwhile?"; + raise Not_found +;;