X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicEnvironment.ml;h=ad61bcd0481795e7b4917b7f330411cc667a259b;hb=cba366ace3c62fd66f99addce68ae0e243622b68;hp=5c1daa1373be26c35df429e23e6789847db69f5d;hpb=de36c6322dde3866f3da822f1795cc518233c79f;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicEnvironment.ml b/helm/ocaml/cic_proof_checking/cicEnvironment.ml index 5c1daa137..ad61bcd04 100644 --- a/helm/ocaml/cic_proof_checking/cicEnvironment.ml +++ b/helm/ocaml/cic_proof_checking/cicEnvironment.ml @@ -165,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) @@ -214,7 +217,7 @@ module Cache : in C.CoFix (i, liftedfl) in - function + function C.Constant (name,bo,ty,params,attrs) -> let bo' = match bo with @@ -292,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 ;; @@ -320,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 *******************************************************************) @@ -393,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 @@ -453,7 +457,7 @@ 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 @@ -475,6 +479,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 = @@ -505,12 +511,15 @@ 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 let obj = try - CicParser.obj_of_xml filename bodyfilename + 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 -> cleanup (); (match exn with @@ -556,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 @@ -632,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 ;; @@ -645,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 @@ -679,7 +691,7 @@ let in_library uri = true with Http_getter_types.Key_not_found _ -> false) -let remove_term = Cache.remove +let remove_obj = Cache.remove let list_uri () = Cache.list_all_cooked_uris ()