X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaWiki.ml;h=52d18f42a3ea5d43caaf6856d02d5aabb8377900;hb=647b419e96770d90a82d7a9e5e8843566a9f93ee;hp=b52e75741f04b11fb25d9cc08b304aa420bc6cb0;hpb=290350836dd1727b3e3cdd4ee71e666a39cc4a09;p=helm.git diff --git a/helm/software/matita/matitaWiki.ml b/helm/software/matita/matitaWiki.ml index b52e75741..52d18f42a 100644 --- a/helm/software/matita/matitaWiki.ml +++ b/helm/software/matita/matitaWiki.ml @@ -64,7 +64,7 @@ let clean_exit n = match !grafite_status with [] -> exit n | grafite_status::_ -> - let baseuri = GrafiteTypes.get_baseuri grafite_status in + let baseuri = grafite_status#baseuri in LibraryClean.clean_baseuris ~verbose:false [baseuri]; exit n @@ -141,10 +141,9 @@ let rec interactive_loop () = grafite_status := drop (to_be_dropped, !grafite_status) ; let grafite_status = safe_hd !grafite_status in LexiconSync.time_travel - ~present:(GrafiteTypes.get_estatus cur_grafite_status) - ~past:(GrafiteTypes.get_estatus grafite_status); - GrafiteSync.time_travel ~present:cur_grafite_status ~past:grafite_status; + GrafiteSync.time_travel + ~present:cur_grafite_status ~past:grafite_status (); interactive_loop (Some n) | `Do command -> let str = Ulexing.from_utf8_string command in @@ -226,8 +225,7 @@ let main () = match !grafite_status with | s::_ -> s#proof_status, s#moo_content_rev, - (GrafiteTypes.get_estatus s)#lstatus.LexiconEngine.lexicon_content_rev, - (GrafiteTypes.get_estatus s)#dump + s#lstatus.LexiconEngine.lexicon_content_rev, s#dump | _ -> assert false in if proof_status <> GrafiteTypes.No_proof then @@ -239,10 +237,9 @@ let main () = else begin let baseuri = - GrafiteTypes.get_baseuri - (match !grafite_status with - [] -> assert false - | s::_ -> s) + (match !grafite_status with + [] -> assert false + | s::_ -> s)#baseuri in let moo_fname = LibraryMisc.obj_file_of_baseuri @@ -254,7 +251,7 @@ let main () = in GrafiteMarshal.save_moo moo_fname moo_content_rev; LexiconMarshal.save_lexicon lexicon_fname lexicon_content_rev; - NRstatus.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri) dump; + NCicLibrary.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri) dump; exit 0 end with