-let get_obj 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
- let o,_ = CicEnvironment.get_obj CicUniv.oblivion_ugraph ouri in
- 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 cache = NUri.UriHash.create 313;;
+let frozen_list = ref [];;
+
+exception Propagate of NUri.uri * exn;;
+
+let get_checked_obj u =
+ if List.exists (fun (k,_) -> NUri.eq u k) !frozen_list
+ then
+ raise (CircularDependency (lazy (NUri.string_of_uri u)))
+ else
+ let obj =
+ try NUri.UriHash.find cache u
+ with
+ Not_found ->
+ let saved_frozen_list = !frozen_list in
+ try
+ let obj =
+ try NCicLibrary.get_obj u
+ with
+ NCicLibrary.ObjectNotFound m -> raise (ObjectNotFound m)
+ in
+ frozen_list := (u,obj)::saved_frozen_list;
+ !typecheck_obj obj;
+ frozen_list := saved_frozen_list;
+ let obj = `WellTyped obj in
+ NUri.UriHash.add cache u obj;
+ obj
+ with
+ Sys.Break as e ->
+ frozen_list := saved_frozen_list;
+ raise e
+ | Propagate (u',_) as e' ->
+ frozen_list := saved_frozen_list;
+ let exn = `Exn (BadDependency (lazy (NUri.string_of_uri u ^
+ " depends (recursively) on " ^ NUri.string_of_uri u' ^
+ " which is not well-typed"))) in
+ NUri.UriHash.add cache u exn;
+ if saved_frozen_list = [] then
+ exn
+ else
+ raise e'
+ | e ->
+ frozen_list := saved_frozen_list;
+ let exn = `Exn e in
+ NUri.UriHash.add cache u exn;
+ if saved_frozen_list = [] then
+ exn
+ else
+ raise (Propagate (u,e))
+ in
+ match obj with
+ `WellTyped o -> o
+ | `Exn e -> raise e