Use seed to avoid further name clashes.

[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 c78508238cfcca6790cf1325e5b4a4267d202090..599e1691f6bd37fd2eb0a18c52ffa9ec88d046ad 100644 (file)
--- a/helm/software/components/ng_kernel/nCicEnvironment.ml
+++ b/helm/software/components/ng_kernel/nCicEnvironment.ml
@@ -6,12 +6,14 @@ let get_checked_obj u =
   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 l = OCic2NCic.convert_obj ouri o in
     List.iter (fun (u,_,_,_,_ as o) -> 
-      prerr_endline ("+"^NUri.string_of_uri u); 
+(*       prerr_endline ("+"^NUri.string_of_uri u);  *)
       NUri.UriHash.add cache u (false,o)) l;
     HExtlib.list_last l
 ;;
@@ -22,11 +24,11 @@ let get_obj u =
     (* in th final implementation should get it from disk *)
     let ouri = NUri.ouri_of_nuri u in
     let o,_ = 
-      CicEnvironment.get_cooked_obj ~trust:true CicUniv.oblivion_ugraph ouri 
+      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); 
+(*       prerr_endline ("+"^NUri.string_of_uri u);  *)
       NUri.UriHash.add cache u (false,o)) l;
     false, HExtlib.list_last l
 ;;
@@ -74,3 +76,12 @@ let get_indty_leftno = 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 [])
+;;
+