X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_engine%2FgrafiteSync.ml;h=ca29d39fcc1a159459bd96ab9bc42d0e52772a76;hb=e9eda8f13045ff3d4f7b1ec93dec96e09bf65f1a;hp=49545e5f46f0f0417353bdd921d3cb014d5899a3;hpb=dcef667a444aa0f189225855c1433d26b65fb8b7;p=helm.git diff --git a/helm/software/components/grafite_engine/grafiteSync.ml b/helm/software/components/grafite_engine/grafiteSync.ml index 49545e5f4..ca29d39fc 100644 --- a/helm/software/components/grafite_engine/grafiteSync.ml +++ b/helm/software/components/grafite_engine/grafiteSync.ml @@ -128,13 +128,13 @@ let add_obj ~pack_coercion_obj uri obj status = in let automation_cache,status = List.fold_left add_to_universe - (status.GrafiteTypes.automation_cache,status) + (status#automation_cache,status) uris_to_index in - {status with - GrafiteTypes.objects = uri :: lemmas @ status.GrafiteTypes.objects; - GrafiteTypes.automation_cache = automation_cache}, - lemmas + (status + #set_objects (uri :: lemmas @ status#objects)) + #set_automation_cache automation_cache, + lemmas let add_coercion ~pack_coercion_obj ~add_composites status uri arity saturations baseuri @@ -142,14 +142,17 @@ let add_coercion ~pack_coercion_obj ~add_composites status uri arity let lemmas = LibrarySync.add_coercion ~add_composites ~pack_coercion_obj uri arity saturations baseuri in - { status with GrafiteTypes.coercions = CoercDb.dump () ; - objects = lemmas @ status.GrafiteTypes.objects - }, - lemmas + let status = + (status + #set_coercions (CoercDb.dump ())) ; + #set_objects (lemmas @ status#objects) + in + let status = NCicCoercion.index_old_db (CoercDb.dump ()) status in + status, lemmas -let prefer_coercion s u = +let prefer_coercion status u = CoercDb.prefer u; - { s with GrafiteTypes.coercions = CoercDb.dump () } + status#set_coercions (CoercDb.dump ()) (** @return l2 \ l1 *) let uri_list_diff l2 l1 = @@ -161,21 +164,15 @@ let uri_list_diff l2 l1 = let time_travel ~present ~past = let objs_to_remove = - uri_list_diff present.GrafiteTypes.objects past.GrafiteTypes.objects in + uri_list_diff present#objects past#objects in List.iter LibrarySync.remove_obj objs_to_remove; - CoercDb.restore past.GrafiteTypes.coercions; + CoercDb.restore past#coercions; + NCicLibrary.time_travel past ;; -let initial_status lexicon_status baseuri = { - GrafiteTypes.moo_content_rev = []; - proof_status = GrafiteTypes.No_proof; - objects = []; - coercions = CoercDb.empty_coerc_db; - automation_cache = AutomationCache.empty (); - baseuri = baseuri; - ng_status = GrafiteTypes.CommandMode lexicon_status; - } - +let initial_status lexicon_status baseuri = + (new GrafiteTypes.status baseuri)#set_lstatus lexicon_status#lstatus +;; let init baseuri = CoercDb.restore CoercDb.empty_coerc_db;