- try NUri.UriHash.find cache u
- with Not_found ->
- let ouri = NUri.ouri_of_nuri u in
- let o,_ =
- CicEnvironment.get_cooked_obj ~trust:false CicUniv.oblivion_ugraph
- ouri 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
+ 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
+;;
+
+let get_checked_decl = function
+ | NReference.Ref (uri, NReference.Decl) ->
+ (match get_checked_obj uri with
+ | _,height,_,_, NCic.Constant (rlv,name,None,ty,att) ->
+ rlv,name,ty,att,height
+ | _,_,_,_, NCic.Constant (_,_,Some _,_,_) ->
+ prerr_endline "get_checked_decl on a definition"; assert false
+ | _ -> prerr_endline "get_checked_decl on a non decl 2"; assert false)
+ | _ -> prerr_endline "get_checked_decl on a non decl"; assert false