X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicEnvironment.ml;h=08166d5640443006405c87e76b9ed1ea8d9e834b;hb=927b0dc91ca0369dd029c43ffe9258e17908fa38;hp=62e7335227d83cb8f62a05c20d5b5945fc961f2b;hpb=218c0062f93dd3221b0266cfbc26fd9cf787ad18;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicEnvironment.ml b/helm/ocaml/cic_proof_checking/cicEnvironment.ml index 62e733522..08166d564 100644 --- a/helm/ocaml/cic_proof_checking/cicEnvironment.ml +++ b/helm/ocaml/cic_proof_checking/cicEnvironment.ml @@ -59,13 +59,17 @@ 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;; (* ************************************************************************** * HERE STARTS THE CACHE MODULE * ************************************************************************** *) +(* I think this should be the right place to implement mecanisms and + * invasriants + *) + (* Cache that uses == instead of = for testing equality *) (* Invariant: an object is always in at most one of the *) (* following states: unchecked, frozen and cooked. *) @@ -95,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 @@ -210,7 +215,7 @@ module Cache : C.CoFix (i, liftedfl) in function - C.Constant (name,bo,ty,params) -> + C.Constant (name,bo,ty,params,attrs) -> let bo' = match bo with None -> None @@ -218,8 +223,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) -> @@ -241,8 +246,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 @@ -250,8 +255,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) -> @@ -263,7 +268,7 @@ module Cache : constructors)) tl in - C.InductiveDefinition (tl', params', paramsno) + C.InductiveDefinition (tl', params', paramsno, attrs) ;; let empty () = @@ -287,14 +292,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 ;; @@ -315,7 +320,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 *******************************************************************) @@ -388,6 +393,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 @@ -448,12 +454,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 ;; @@ -466,6 +476,8 @@ 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 = @@ -496,15 +508,24 @@ let get_object_to_add uri = | None -> () end in - (* this brakes something : - * let _ = CicUniv.restart_numbering () in - *) + (* restarts the numbering of named universes (the ones inside the cic) *) + let _ = CicUniv.restart_numbering () in + (* HACK ORRIBILE: fa in modo che il parser metta degli universi fresh non + * anonimi *) + let _ = CicParser3.set_uri uri in let obj = try - CicParser.obj_of_xml filename bodyfilename + let time = Unix.gettimeofday() in + let rc = CicParser.obj_of_xml filename bodyfilename in + total_parsing_time := + !total_parsing_time +. ((Unix.gettimeofday()) -. time ); + rc with exn -> cleanup (); - raise 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 @@ -544,23 +565,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 + prerr_endline ( "?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 -> + prerr_endline ( + "?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 @@ -620,6 +647,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 ;; @@ -633,12 +661,8 @@ 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 @@ -649,26 +673,38 @@ let put_inductive_definition uri (obj,ugraph) = | _ -> raise OnlyPutOfInductiveDefinitionsIsAllowed ;; -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_cache uri = + Cache.is_in_cooked uri || Cache.is_in_frozen uri || Cache.is_in_unchecked uri let add_type_checked_term uri (obj,ugraph) = match obj with - Cic.Constant (s,(Some bo),ty,ul) -> + Cic.Constant (s,(Some bo),ty,ul,_) -> Cache.add_cooked ~key:uri (obj,ugraph) | _ -> assert false ;; -let remove_term = Cache.remove +let in_library uri = + in_cache uri || + (try + ignore (Http_getter.resolve' uri); + true + with Http_getter_types.Key_not_found _ -> false) + +let remove_obj = Cache.remove + +let list_uri () = + Cache.list_all_cooked_uris () +;; +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 -> + prerr_endline "Who has removed the uri in the meanwhile?"; + raise Not_found +;;