added case of const and axiom

[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 4a6a21d9da0a92a648927404e58f4cb4572457ac..c78508238cfcca6790cf1325e5b4a4267d202090 100644 (file)
--- a/helm/software/components/ng_kernel/nCicEnvironment.ml
+++ b/helm/software/components/ng_kernel/nCicEnvironment.ml
@@ -1,16 +1,38 @@
 let cache = NUri.UriHash.create 313;;
 
 let get_checked_obj u =
-  try NUri.UriHash.find cache u
+  try let b, o = NUri.UriHash.find cache u in 
+   if not b then assert false else o
   with Not_found ->
     let ouri = NUri.ouri_of_nuri u in
     let o,_ = 
-      CicEnvironment.get_cooked_obj ~trust:false CicUniv.oblivion_ugraph 
-        ouri in
+      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
+    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;
+    HExtlib.list_last l
+;;
+
+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_cooked_obj ~trust:true 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 add_obj (u,_,_,_,_ as o) =
+  NUri.UriHash.replace cache u (true, o)
 ;;
 
 let get_checked_def = function