X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=matita%2Fcomponents%2Fng_library%2FnCicLibrary.ml;h=ae6666be581fbae322e84226e43708be8cbc54b9;hb=4556677f40e6b979d9bdaa4475bb1ca6701264f8;hp=7cef1e3de66fb2ad68ad2684b973527f878cb06b;hpb=2c01ff6094173915e7023076ea48b5804dca7778;p=helm.git diff --git a/matita/components/ng_library/nCicLibrary.ml b/matita/components/ng_library/nCicLibrary.ml index 7cef1e3de..ae6666be5 100644 --- a/matita/components/ng_library/nCicLibrary.ml +++ b/matita/components/ng_library/nCicLibrary.ml @@ -12,6 +12,7 @@ (* $Id$ *) exception LibraryOutOfSync of string Lazy.t +exception IncludedFileNotCompiled of string * string let magic = 2;; @@ -21,13 +22,15 @@ let refresh_uri_in_universe = List.map (fun (x,u) -> x, refresh_uri u) ;; +let refresh_uri_in_reference (NReference.Ref (uri,spec)) = + NReference.reference_of_spec (refresh_uri uri) spec + let rec refresh_uri_in_term = function | NCic.Meta (i,(n,NCic.Ctx l)) -> NCic.Meta (i,(n,NCic.Ctx (List.map refresh_uri_in_term l))) | NCic.Meta _ as t -> t - | NCic.Const (NReference.Ref (u,spec)) -> - NCic.Const (NReference.reference_of_spec (refresh_uri u) spec) + | NCic.Const ref -> NCic.Const (refresh_uri_in_reference ref) | NCic.Sort (NCic.Type l) -> NCic.Sort (NCic.Type (refresh_uri_in_universe l)) | NCic.Match (NReference.Ref (uri,spec),outtype,term,pl) -> let r = NReference.reference_of_spec (refresh_uri uri) spec in @@ -45,7 +48,7 @@ let refresh_uri_in_obj (uri,height,metasenv,subst,obj_kind) = NCicUntrusted.map_obj_kind refresh_uri_in_term obj_kind ;; -let path_of_baseuri ?(no_suffix=false) baseuri = +let ng_path_of_baseuri ?(no_suffix=false) baseuri = let uri = NUri.string_of_uri baseuri in let path = String.sub uri 4 (String.length uri - 4) in let path = Helm_registry.get "matita.basedir" ^ path in @@ -67,11 +70,10 @@ let require_path path = dump ;; -let require0 ~baseuri = require_path (path_of_baseuri baseuri);; +let require0 ~baseuri = require_path (ng_path_of_baseuri baseuri) let db_path () = Helm_registry.get "matita.basedir" ^ "/ng_db.ng";; - type timestamp = [ `Obj of NUri.uri * NCic.obj | `Constr of NCic.universe * NCic.universe] list * @@ -86,6 +88,8 @@ let local_aliases = ref [];; let cache = ref NUri.UriMap.empty;; let includes = ref [];; +let get_already_included () = !includes;; + let load_db,set_global_aliases,get_global_aliases,add_deps,get_deps,remove_deps= let global_aliases = ref [] in let rev_includes_map = ref NUri.UriMap.empty in @@ -143,54 +147,11 @@ let load_db,set_global_aliases,get_global_aliases,add_deps,get_deps,remove_deps= let init = load_db;; -type automation_cache = NDiscriminationTree.DiscriminationTree.t -type unit_eq_cache = NCicParamod.state - -class type g_eq_status = - object - method eq_cache : unit_eq_cache - end - -class eq_status = - object(self) - val eq_cache = NCicParamod.empty_state - method eq_cache = eq_cache - method set_eq_cache v = {< eq_cache = v >} - method set_eq_status - : 'status. #g_eq_status as 'status -> 'self - = fun o -> self#set_eq_cache o#eq_cache - end - -class type g_auto_status = - object - method auto_cache : automation_cache - end - -class auto_status = - object(self) - val auto_cache = NDiscriminationTree.DiscriminationTree.empty - method auto_cache = auto_cache - method set_auto_cache v = {< auto_cache = v >} - method set_auto_status - : 'status. #g_auto_status as 'status -> 'self - = fun o -> self#set_auto_cache o#auto_cache - end - -class type g_status = - object - inherit NRstatus.g_status - method timestamp: timestamp - end - class status = - object(self) - inherit NRstatus.status + object val timestamp = (time0 : timestamp) method timestamp = timestamp method set_timestamp v = {< timestamp = v >} - method set_library_status - : 'status. #g_status as 'status -> 'self - = fun o -> self#set_timestamp o#timestamp end let time_travel status = @@ -202,14 +163,14 @@ let time_travel status = storage := sto; local_aliases := ali; cache := cac; includes := inc ;; -let serialize ~baseuri dump = - let ch = open_out (path_of_baseuri baseuri) in - Marshal.to_channel ch (magic,dump) []; +let serialize ~baseuri ~dependencies dump = + let ch = open_out (ng_path_of_baseuri baseuri) in + Marshal.to_channel ch (magic,(dependencies,dump)) []; close_out ch; List.iter (function | `Obj (uri,obj) -> - let ch = open_out (path_of_baseuri uri) in + let ch = open_out (ng_path_of_baseuri uri) in Marshal.to_channel ch (magic,obj) []; close_out ch | `Constr _ -> () @@ -221,37 +182,42 @@ let serialize ~baseuri dump = type obj = string * Obj.t - -class type g_dumpable_status = - object - inherit g_status - inherit g_auto_status - inherit g_eq_status - method dump: obj list - end - class dumpable_status = - object(self) - inherit status - inherit auto_status - inherit eq_status + object val dump = ([] : obj list) method dump = dump method set_dump v = {< dump = v >} - method set_dumpable_status : 'status. #g_dumpable_status as 'status -> 'self - = fun o -> - (((self#set_dump o#dump)#set_coercion_status o)#set_auto_status o)#set_eq_status o end -type 'a register_type = - < run: 'status. - 'a -> refresh_uri_in_universe:(NCic.universe -> - NCic.universe) -> refresh_uri_in_term:(NCic.term -> NCic.term) -> - (#dumpable_status as 'status) -> 'status > +module type SerializerType = + sig + type dumpable_status + + type 'a register_type = + 'a -> + refresh_uri_in_universe:(NCic.universe -> NCic.universe) -> + refresh_uri_in_term:(NCic.term -> NCic.term) -> + refresh_uri_in_reference:(NReference.reference -> NReference.reference) -> + dumpable_status -> dumpable_status + + val register: < run: 'a. string -> 'a register_type -> ('a -> obj) > + val serialize: baseuri:NUri.uri -> dependencies:string list -> obj list -> unit + (* the obj is the "include" command to be added to the dump list *) + val require: baseuri:NUri.uri -> dumpable_status -> dumpable_status * obj + val dependencies_of: baseuri:NUri.uri -> string list + end -module Serializer = +module Serializer(D: sig type dumpable_status end) = struct - let require1 = ref (object method run : 'status. obj -> (#dumpable_status as 'status) -> 'status = fun _ -> assert false end (* unknown data*)) + type dumpable_status = D.dumpable_status + type 'a register_type = + 'a -> + refresh_uri_in_universe:(NCic.universe -> NCic.universe) -> + refresh_uri_in_term:(NCic.term -> NCic.term) -> + refresh_uri_in_reference:(NReference.reference -> NReference.reference) -> + dumpable_status -> dumpable_status + + let require1 = ref (fun _ -> assert false) (* unknown data*) let already_registered = ref [] let register = @@ -262,23 +228,39 @@ module Serializer = already_registered := tag :: !already_registered; let old_require1 = !require1 in require1 := - object - method run : 'status. obj -> (#dumpable_status as 'status) -> 'status = - fun ((tag',data) as x) -> - if tag=tag' then - require#run (Obj.magic data) ~refresh_uri_in_universe ~refresh_uri_in_term - else - old_require1#run x - end; + (fun ((tag',data) as x) -> + if tag=tag' then + require (Obj.magic data) ~refresh_uri_in_universe ~refresh_uri_in_term + ~refresh_uri_in_reference + else + old_require1 x); (fun x -> tag,Obj.repr x) end let serialize = serialize + let require2 ~baseuri status = + try + includes := baseuri::!includes; + let _dependencies,dump = require0 ~baseuri in + List.fold_right !require1 dump status + with + Sys_error _ -> + raise (IncludedFileNotCompiled(ng_path_of_baseuri baseuri,NUri.string_of_uri baseuri)) + + let dependencies_of ~baseuri = fst (require0 ~baseuri) + + let record_include = + let aux baseuri ~refresh_uri_in_universe ~refresh_uri_in_term + ~refresh_uri_in_reference = + (* memorizzo baseuri in una tabella; *) + require2 ~baseuri + in + register#run "include" aux + let require ~baseuri status = - includes := baseuri::!includes; - let dump = require0 ~baseuri in - List.fold_right !require1#run dump status + let status = require2 ~baseuri status in + status,record_include baseuri end @@ -286,8 +268,8 @@ 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 + HExtlib.safe_remove (ng_path_of_baseuri baseuri); + let basepath = ng_path_of_baseuri ~no_suffix:true baseuri in try let od = Unix.opendir basepath in let rec aux names = @@ -385,15 +367,8 @@ let get_obj u = with Sys_error _ -> try NUri.UriMap.find u !cache with Not_found -> - let ouri = NCic2OCic.ouri_of_nuri u in - try - let o,_ = CicEnvironment.get_obj CicUniv.oblivion_ugraph ouri in - let l = OCic2NCic.convert_obj ouri o in - List.iter (fun (u,_,_,_,_ as o) -> cache:= NUri.UriMap.add u o !cache) l; - HExtlib.list_last l - with CicEnvironment.Object_not_found u -> - raise (NCicEnvironment.ObjectNotFound - (lazy (NUri.string_of_uri (OCic2NCic.nuri_of_ouri u)))) + raise (NCicEnvironment.ObjectNotFound + (lazy (NUri.string_of_uri u))) ;; let clear_cache () = cache := NUri.UriMap.empty;;