Invert dependencies between baseuris (files) are now stored in the db.

[helm.git] / helm / software / components / ng_kernel / nCicEnvironment.ml

diff --git a/helm/software/components/ng_kernel/nCicEnvironment.ml b/helm/software/components/ng_kernel/nCicEnvironment.ml
index 9cad0554cea2381845aaf63a654e008507481dbb..ef3bca22d06941ebfa20fe883d4423eb7ec87e0e 100644 (file)
--- a/helm/software/components/ng_kernel/nCicEnvironment.ml
+++ b/helm/software/components/ng_kernel/nCicEnvironment.ml
@@ -16,9 +16,12 @@ module Ref = NReference
 
 exception CircularDependency of string Lazy.t;;
 exception ObjectNotFound of string Lazy.t;;
-exception BadDependency of string Lazy.t;;
+exception BadDependency of string Lazy.t * exn;;
 exception BadConstraint of string Lazy.t;;
 
+let get_obj = ref (fun _ -> assert false);;
+let set_get_obj f = get_obj := f;;
+
 let type0 = []
 
 let max l1 l2 =
@@ -125,26 +128,23 @@ let get_checked_obj u =
     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
+      let obj = !get_obj u 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' ->
+      | 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"))) in
+           " which is not well-typed"), 
+           match old_exn with BadDependency (_,e) -> e | _ -> old_exn)) in
          NUri.UriHash.add cache u exn;
          if saved_frozen_list = [] then
           exn