CoFix cache implemented

[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 52c3ebca7dcbc8790360137dc44a30754851f5fc..cca0e5cdf55868a9e38c411710f0a51e3295afa4 100644 (file)
--- a/helm/software/components/ng_kernel/nCicEnvironment.ml
+++ b/helm/software/components/ng_kernel/nCicEnvironment.ml
@@ -1,5 +1,14 @@
 let cache = NUri.UriHash.create 313;;
 
+let oldg = ref CicUniv.empty_ugraph;;
+
+let load_graph uri = 
+  let _,g = CicEnvironment.get_obj !oldg uri in
+  oldg := g
+;;
+
+let get_graph _ = !oldg;;
+
 let get_checked_obj u =
   try let b, o = NUri.UriHash.find cache u in 
    if not b then assert false else o
@@ -23,9 +32,7 @@ let get_obj 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_obj CicUniv.oblivion_ugraph ouri 
-    in
+    let o,_ = 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);  *)
@@ -61,13 +68,12 @@ let get_checked_fix_or_cofix b = function
   | NReference.Ref (_, uri, (NReference.Fix (fixno,_)|NReference.CoFix fixno))->
       (match get_checked_obj uri with
       | _,height,_,_, NCic.Fixpoint (is_fix,funcs,att) when is_fix = b ->
-         let rlv, name, _, ty, bo = List.nth funcs fixno in
-         rlv, name, bo, ty, att, height
+         funcs, att, height
       | _ ->prerr_endline "get_checked_(co)fix on a non (co)fix 2";assert false)
   | r -> prerr_endline ("get_checked_(co)fix on " ^ NReference.string_of_reference r); assert false
 ;;
-let get_checked_fix r = get_checked_fix_or_cofix true r;;
-let get_checked_cofix r = get_checked_fix_or_cofix false r;;
+let get_checked_fixes r = get_checked_fix_or_cofix true r;;
+let get_checked_cofixes r = get_checked_fix_or_cofix false r;;
 
 let get_indty_leftno = function 
   | NReference.Ref (_, uri, NReference.Ind _)