+let to_exn f x =
+ match f x with
+ `WellTyped o -> o
+ | `Exn e -> raise e
+;;
+
+let check_and_add_obj ((u,_,_,_,_) as obj) =
+ let saved_frozen_list = !frozen_list in
+ try
+ 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';
+ history := (`Obj (u,obj))::!history;
+ obj'
+ with
+ Sys.Break as e ->
+ frozen_list := saved_frozen_list;
+ raise e
+ | Propagate (u',old_exn) 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"),
+ match old_exn with BadDependency (_,e) -> e | _ -> old_exn)) in
+ NUri.UriHash.add cache u exn;
+ history := (`Obj (u,obj))::!history;
+ 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;
+ history := (`Obj (u,obj))::!history;
+ if saved_frozen_list = [] then
+ exn
+ else
+ raise (Propagate (u,e))
+;;
+