let cache = NUri.UriHash.create 313;;
let get_checked_obj u =
- try NUri.UriHash.find cache u
+ try let b, o = NUri.UriHash.find cache u in
+ if not b then assert false else o
with Not_found ->
let ouri = NUri.ouri_of_nuri u in
let o,_ =
- CicEnvironment.get_cooked_obj ~trust:false CicUniv.oblivion_ugraph ouri
+ try
+ CicEnvironment.get_obj CicUniv.oblivion_ugraph ouri
+ with exn -> prerr_endline (UriManager.string_of_uri ouri); raise exn
in
(* FIX: add all objects to the environment and give back the last one *)
- let no = HExtlib.list_last (OCic2NCic.convert_obj ouri o) in
- NUri.UriHash.add cache u no;
- no
+ let l = OCic2NCic.convert_obj ouri o in
+ List.iter (fun (u,_,_,_,_ as o) ->
+(* prerr_endline ("+"^NUri.string_of_uri u); *)
+ NUri.UriHash.add cache u (false,o)) l;
+ HExtlib.list_last l
;;
let get_obj u =
- try true, NUri.UriHash.find cache u
+ try NUri.UriHash.find cache u
with Not_found ->
(* in th final implementation should get it from disk *)
let ouri = NUri.ouri_of_nuri u in
- prerr_endline (UriManager.string_of_uri ouri);
let o,_ =
- CicEnvironment.get_cooked_obj ~trust:true CicUniv.oblivion_ugraph ouri
+ CicEnvironment.get_obj CicUniv.oblivion_ugraph ouri
in
- (* here we should freeze it *)
- false, HExtlib.list_last (OCic2NCic.convert_obj ouri o)
+ let l = OCic2NCic.convert_obj ouri o in
+ List.iter (fun (u,_,_,_,_ as o) ->
+(* prerr_endline ("+"^NUri.string_of_uri u); *)
+ NUri.UriHash.add cache u (false,o)) l;
+ false, HExtlib.list_last l
;;
let add_obj (u,_,_,_,_ as o) =
- (* we should unfreeze it *)
- NUri.UriHash.add cache u o
+ NUri.UriHash.replace cache u (true, o)
;;
let get_checked_def = function
| _,_,_,_, NCic.Inductive (_,left,_,_) -> left
| _ ->prerr_endline "get_indty_leftno called on a non ind 2";assert false)
| _ -> prerr_endline "get_indty_leftno called on a non indty";assert false
+;;
+
+let invalidate _ =
+ List.iter
+ (fun (k,v) ->
+ NUri.UriHash.replace cache k (false,v))
+ (NUri.UriHash.fold (fun k v -> (@) [k,snd v]) cache [])
+;;
+