The global db is now updated during decompilation.

diff --git a/helm/software/components/ng_kernel/nCicLibrary.ml b/helm/software/components/ng_kernel/nCicLibrary.ml
index 984b7ef6840a68552e952c58b882d10addbb2bb7..a36b70bf4a6404b6b1302eb182076b95fa71c4ea 100644 (file)
--- a/helm/software/components/ng_kernel/nCicLibrary.ml
+++ b/helm/software/components/ng_kernel/nCicLibrary.ml
@@ -13,31 +13,7 @@
 
 exception LibraryOutOfSync of string Lazy.t
 
-type timestamp =
- (NUri.uri * NCic.obj) list *
- (NUri.uri * string * NReference.reference) list *
- NCic.obj NUri.UriMap.t;;
-
-let time0 = [],[],NUri.UriMap.empty;;
-let storage = ref [];;
-let local_aliases = ref [];;
-let global_aliases = ref [];;
-let cache = ref NUri.UriMap.empty;;
-
-class status =
- object
-  val timestamp = (time0 : timestamp)
-  method timestamp = timestamp
-  method set_timestamp v = {< timestamp = v >}
-  method set_library_status
-   : 'status. < timestamp : timestamp; .. > as 'status -> 'self
-   = fun o -> {< timestamp = o#timestamp >}
- end
-
-let time_travel status =
- let sto,ali,cac = status#timestamp in
-  storage := sto; local_aliases := ali; cache := cac
-;;
+let magic = 0;;
 
 let path_of_baseuri ?(no_suffix=false) baseuri =
  let uri = NUri.string_of_uri baseuri in
@@ -51,8 +27,6 @@ let path_of_baseuri ?(no_suffix=false) baseuri =
    path ^ ".ng"
 ;;
 
-let magic = 0;;
-
 let require_path path =
  let ch = open_in path in
  let mmagic,dump = Marshal.from_channel ch in
@@ -67,13 +41,49 @@ let require0 ~baseuri = require_path (path_of_baseuri baseuri);;
 
 let db_path () = Helm_registry.get "matita.basedir" ^ "/ng_db.ng";;
 
+type timestamp =
+ (NUri.uri * NCic.obj) list *
+ (NUri.uri * string * NReference.reference) list *
+ NCic.obj NUri.UriMap.t;;
+
+let time0 = [],[],NUri.UriMap.empty;;
+let storage = ref [];;
+let local_aliases = ref [];;
+let set_global_aliases,get_global_aliases =
+ let global_aliases = ref [] in
+  let store_db () =
+   let ch = open_out (db_path ()) in
+   Marshal.to_channel ch (magic,!global_aliases) [];
+   close_out ch;
+  in
+  (fun ga -> global_aliases := ga; store_db ()),
+  (fun () -> !global_aliases)
+;;
+
 let init () =
  try
-  global_aliases := require_path (db_path ())
+  set_global_aliases (require_path (db_path ()))
  with
   Sys_error _ -> ()
 ;;
 
+let cache = ref NUri.UriMap.empty;;
+
+class status =
+ object
+  val timestamp = (time0 : timestamp)
+  method timestamp = timestamp
+  method set_timestamp v = {< timestamp = v >}
+  method set_library_status
+   : 'status. < timestamp : timestamp; .. > as 'status -> 'self
+   = fun o -> {< timestamp = o#timestamp >}
+ end
+
+let time_travel status =
+ let sto,ali,cac = status#timestamp in
+  storage := sto; local_aliases := ali; cache := cac
+;;
+
 let serialize ~baseuri dump =
  let ch = open_out (path_of_baseuri baseuri) in
  Marshal.to_channel ch (magic,dump) [];
@@ -84,10 +94,7 @@ let serialize ~baseuri dump =
     Marshal.to_channel ch (magic,obj) [];
     close_out ch
   ) !storage;
- global_aliases := !local_aliases @ !global_aliases;
- let ch = open_out (db_path ()) in
- Marshal.to_channel ch (magic,!global_aliases) [];
- close_out ch;
+ set_global_aliases (!local_aliases @ get_global_aliases ());
  time_travel (new status)
 ;;
 
@@ -159,7 +166,12 @@ let decompile ~baseuri =
   let names = List.map (fun name -> basepath ^ "/" ^ name) (aux []) in
    Unix.closedir od;
    List.iter Unix.unlink names;
-   HExtlib.rmdir_descend basepath
+   HExtlib.rmdir_descend basepath;
+   set_global_aliases
+    (List.filter
+     (fun (_,_,NReference.Ref (nuri,_)) ->
+       Filename.dirname (NUri.string_of_uri nuri) <> NUri.string_of_uri baseuri
+     ) (get_global_aliases ()))
  with
   Unix.Unix_error _ -> () (* raised by Unix.opendir, we hope :-) *)
 ;;
@@ -176,7 +188,7 @@ let resolve name =
  try
   HExtlib.filter_map
    (fun (_,name',nref) -> if name'=name then Some nref else None)
-   (!local_aliases @ !global_aliases)
+   (!local_aliases @ get_global_aliases ())
  with
   Not_found -> raise (NCicEnvironment.ObjectNotFound (lazy name))
 ;;