exception LibraryOutOfSync of string Lazy.t
-let magic = 1;;
+let magic = 2;;
let refresh_uri uri = NUri.uri_of_string (NUri.string_of_uri uri);;
+let refresh_uri_in_universe =
+ List.map (fun (x,u) -> x, refresh_uri u)
+;;
+
let rec refresh_uri_in_term =
function
- NCic.Const (NReference.Ref (u,spec)) ->
+ | NCic.Const (NReference.Ref (u,spec)) ->
NCic.Const (NReference.reference_of_spec (refresh_uri u) spec)
+ | NCic.Sort (NCic.Type l) -> NCic.Sort (NCic.Type (refresh_uri_in_universe l))
| t -> NCicUtils.map (fun _ _ -> ()) () (fun _ -> refresh_uri_in_term) t
;;
let refresh_uri_in_obj (uri,height,metasenv,subst,obj_kind) =
assert (metasenv = []);
assert (subst = []);
- uri,height,metasenv,subst,
+ refresh_uri uri,height,metasenv,subst,
NCicUntrusted.map_obj_kind refresh_uri_in_term obj_kind
;;
let db_path () = Helm_registry.get "matita.basedir" ^ "/ng_db.ng";;
+
type timestamp =
- (NUri.uri * NCic.obj) list *
+ [ `Obj of NUri.uri * NCic.obj
+ | `Constr of bool * NCic.universe * NCic.universe] list *
(NUri.uri * string * NReference.reference) list *
NCic.obj NUri.UriMap.t *
- NUri.uri list;;
+ NUri.uri list
+;;
let time0 = [],[],NUri.UriMap.empty,[];;
let storage = ref [];;
let cache = ref NUri.UriMap.empty;;
let includes = ref [];;
-let load_db,set_global_aliases,get_global_aliases,add_deps,get_deps =
+let load_db,set_global_aliases,get_global_aliases,add_deps,get_deps,remove_deps=
let global_aliases = ref [] in
- let includes_map = ref NUri.UriMap.empty in
+ let rev_includes_map = ref NUri.UriMap.empty in
let store_db () =
let ch = open_out (db_path ()) in
- Marshal.to_channel ch (magic,(!global_aliases,!includes_map)) [];
+ Marshal.to_channel ch (magic,(!global_aliases,!rev_includes_map)) [];
close_out ch in
let load_db () =
+ HExtlib.mkdir (Helm_registry.get "matita.basedir");
try
let ga,im = require_path (db_path ()) in
let ga =
) im NUri.UriMap.empty
in
global_aliases := ga;
- includes_map := im
+ rev_includes_map := im
with
Sys_error _ -> () in
let get_deps u =
let get_deps_one_step u =
- try NUri.UriMap.find u !includes_map with Not_found -> [] in
+ try NUri.UriMap.find u !rev_includes_map with Not_found -> [] in
let rec aux res =
function
[] -> res
else
aux (he::res) (get_deps_one_step he @ tl)
in
- aux [] [u]
+ aux [] [u] in
+ let remove_deps u =
+ rev_includes_map := NUri.UriMap.remove u !rev_includes_map;
+ rev_includes_map :=
+ NUri.UriMap.map
+ (fun l -> List.filter (fun uri -> not (NUri.eq u uri)) l) !rev_includes_map;
+ store_db ()
in
load_db,
(fun ga -> global_aliases := ga; store_db ()),
(fun () -> !global_aliases),
(fun u l ->
- includes_map := NUri.UriMap.add u (l @ get_deps u) !includes_map;
+ rev_includes_map := NUri.UriMap.add u (l @ get_deps u) !rev_includes_map;
store_db ()),
- get_deps
+ get_deps,
+ remove_deps
;;
let init = load_db;;
+
class status =
object
val timestamp = (time0 : timestamp)
let time_travel status =
let sto,ali,cac,inc = status#timestamp in
- storage := sto; local_aliases := ali; cache := cac; includes := inc
+ let diff_len = List.length !storage - List.length sto in
+ let to_be_deleted,_ = HExtlib.split_nth diff_len !storage in
+ if List.length to_be_deleted > 0 then
+ NCicEnvironment.invalidate_item (HExtlib.list_last to_be_deleted);
+ storage := sto; local_aliases := ali; cache := cac; includes := inc
;;
let serialize ~baseuri dump =
Marshal.to_channel ch (magic,dump) [];
close_out ch;
List.iter
- (fun (uri,obj) ->
- let ch = open_out (path_of_baseuri uri) in
- Marshal.to_channel ch (magic,obj) [];
- close_out ch
+ (function
+ | `Obj (uri,obj) ->
+ let ch = open_out (path_of_baseuri uri) in
+ Marshal.to_channel ch (magic,obj) [];
+ close_out ch
+ | `Constr _ -> ()
) !storage;
set_global_aliases (!local_aliases @ get_global_aliases ());
List.iter (fun u -> add_deps u [baseuri]) !includes;
type obj
val register:
string ->
- ('a -> refresh_uri_in_term:(NCic.term -> NCic.term) -> status -> status) ->
+ ('a -> refresh_uri_in_universe:(NCic.universe -> NCic.universe) -> refresh_uri_in_term:(NCic.term -> NCic.term) -> status -> status) ->
('a -> obj)
val serialize: baseuri:NUri.uri -> obj list -> unit
val require: baseuri:NUri.uri -> status -> status
require1 :=
(fun (tag',data) as x ->
if tag=tag' then
- require (Obj.magic data) ~refresh_uri_in_term
+ require (Obj.magic data) ~refresh_uri_in_universe ~refresh_uri_in_term
else
!require1 x);
(fun x -> tag,Obj.repr x)
let decompile ~baseuri =
let baseuris = get_deps baseuri in
List.iter (fun baseuri ->
+ remove_deps baseuri;
HExtlib.safe_remove (path_of_baseuri baseuri);
let basepath = path_of_baseuri ~no_suffix:true baseuri in
try
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 :-) *)
- assert (List.length baseuris = 1)
+ Unix.Unix_error _ -> () (* raised by Unix.opendir, we hope :-) *)
) baseuris
;;
Not_found -> raise (NCicEnvironment.ObjectNotFound (lazy (NUri.string_of_uri uri)))
;;
-let add_obj status u obj =
- storage := (u,obj)::!storage;
+let add_obj status ((u,_,_,_,_) as obj) =
+ NCicEnvironment.check_and_add_obj obj;
+ storage := (`Obj (u,obj))::!storage;
let _,height,_,_,obj = obj in
let references =
match obj with
status#set_timestamp (!storage,!local_aliases,!cache,!includes)
;;
+let add_constraint status strict u1 u2 =
+ NCicEnvironment.add_constraint strict u1 u2;
+ storage := (`Constr (strict,u1,u2)) :: !storage;
+ status#set_timestamp (!storage,!local_aliases,!cache,!includes)
+;;
+
let get_obj u =
- try List.assq u !storage
+ try
+ List.assq u
+ (HExtlib.filter_map
+ (function `Obj (u,o) -> Some (u,o) | _ -> None )
+ !storage)
with Not_found ->
try fetch_obj u
with Sys_error _ ->
projects / helm.git / blobdiff