X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaSync.ml;h=95dab03607493fb3f56e8ddccecaadefb92cf755;hb=37daa227f906a30b6d142e03f7589961476ce50d;hp=6662b7d6efeb7f410734e510af80bf3332c583d3;hpb=e64a1cf254620a3397bceabee53f2726a06ee0e7;p=helm.git diff --git a/helm/matita/matitaSync.ml b/helm/matita/matitaSync.ml index 6662b7d6e..95dab0360 100644 --- a/helm/matita/matitaSync.ml +++ b/helm/matita/matitaSync.ml @@ -34,30 +34,35 @@ let alias_diff ~from status = try let description2,_ = Map.find domain_item from.aliases in if description1 <> description2 then - Map.add domain_item codomain_item acc + (domain_item,codomain_item)::acc else acc with Not_found -> - Map.add domain_item codomain_item acc) - status.aliases Map.empty + (domain_item,codomain_item)::acc) + status.aliases [] let alias_diff = - let profiler = CicUtil.profile "accusato" in + let profiler = CicUtil.profile "alias_diff (conteggiato anche in include)" in fun ~from status -> profiler.CicUtil.profile (alias_diff ~from) status -let set_proof_aliases status aliases = - let new_status = { status with aliases = aliases } in - let diff = alias_diff ~from:status new_status in +let set_proof_aliases status new_aliases = + let aliases = + List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.add d c acc) + status.aliases new_aliases in let multi_aliases = - DisambiguateTypes.Environment.fold DisambiguateTypes.Environment.cons - diff status.multi_aliases in - let new_status = { new_status with multi_aliases = multi_aliases } in - if DisambiguateTypes.Environment.is_empty diff then + List.fold_left (fun acc (d,c) -> DisambiguateTypes.Environment.cons d c acc) + status.multi_aliases new_aliases in + let new_status = + { status with multi_aliases = multi_aliases ; aliases = aliases} + in + if new_aliases = [] then new_status else - add_moo_content (DisambiguatePp.commands_of_environment diff) new_status - + add_moo_content + (DisambiguatePp.commands_of_domain_and_codomain_items_list new_aliases) + new_status + (** given a uri and a type list (the contructors types) builds a list of pairs * (name,uri) that is used to generate authomatic aliases **) let extract_alias types uri = @@ -72,19 +77,21 @@ let extract_alias types uri = ) (acc,1) cl)),i+1 ) ([],0) types) -let env_of_list l env = - let l' = List.map (fun (name,suri) -> name,suri,CicUtil.term_of_uri (UriManager.uri_of_string suri)) l in - DisambiguateTypes.env_of_list l' env +let build_aliases = + List.map + (fun (name,suri) -> + DisambiguateTypes.Id name, + (suri, fun _ _ _ -> CicUtil.term_of_uri (UriManager.uri_of_string suri))) let add_aliases_for_inductive_def status types suri = let uri = UriManager.uri_of_string suri in - let aliases = env_of_list (extract_alias types uri) status.aliases in - set_proof_aliases status aliases + let aliases = build_aliases (extract_alias types uri) in + set_proof_aliases status aliases let add_alias_for_constant status suri = let uri = UriManager.uri_of_string suri in let name = UriManager.name_of_uri uri in - let new_env = env_of_list [(name,suri)] status.aliases in + let new_env = build_aliases [(name,suri)] in set_proof_aliases status new_env let add_aliases_for_object status suri = @@ -99,6 +106,7 @@ let paths_and_uris_of_obj uri status = let basedir = get_string_option status "basedir" ^ "/xml" in let innertypesuri = UriManager.innertypesuri_of_uri uri in let bodyuri = UriManager.bodyuri_of_uri uri in + let univgraphuri = UriManager.univgraphuri_of_uri uri in let innertypesfilename = Str.replace_first (Str.regexp "^cic:") "" (UriManager.string_of_uri innertypesuri) ^ ".xml.gz" in let innertypespath = basedir ^ "/" ^ innertypesfilename in @@ -108,39 +116,38 @@ let paths_and_uris_of_obj uri status = let xmlbodyfilename = Str.replace_first (Str.regexp "^cic:/") "" (UriManager.string_of_uri uri) ^ ".body.xml.gz" in let xmlbodypath = basedir ^ "/" ^ xmlbodyfilename in - xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri + let xmlunivgraphfilename = Str.replace_first (Str.regexp "^cic:/") "" + (UriManager.string_of_uri univgraphuri) ^ ".xml.gz" in + let xmlunivgraphpath = basedir ^ "/" ^ xmlunivgraphfilename in + xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri, + xmlunivgraphpath, univgraphuri -let save_object_to_disk status uri obj = +let save_object_to_disk status uri obj ugraph univlist = let ensure_path_exists path = let dir = Filename.dirname path in MatitaMisc.mkdir dir in (* generate annobj, ids_to_inner_sorts and ids_to_inner_types *) - let annobj,_,_,ids_to_inner_sorts,ids_to_inner_types,_,_ = - Cic2acic.acic_object_of_cic_object ~eta_fix:false obj - in + let annobj = Cic2acic.plain_acic_object_of_cic_object obj in (* prepare XML *) let xml, bodyxml = - Cic2Xml.print_object uri ~ids_to_inner_sorts ~ask_dtd_to_the_getter:false - annobj + Cic2Xml.print_object + uri ?ids_to_inner_sorts:None ~ask_dtd_to_the_getter:false annobj in - let xmlinnertypes = - Cic2Xml.print_inner_types uri ~ids_to_inner_sorts ~ids_to_inner_types - ~ask_dtd_to_the_getter:false - in - let xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri = + let xmlpath, xmlbodypath, innertypespath, bodyuri, innertypesuri, + xmlunivgraphpath, univgraphuri = paths_and_uris_of_obj uri status in let path_scheme_of path = "file://" ^ path in List.iter MatitaMisc.mkdir (List.map Filename.dirname [innertypespath; xmlpath]); (* now write to disk *) - ensure_path_exists innertypespath; - Xml.pp ~gzip:true xmlinnertypes (Some innertypespath); ensure_path_exists xmlpath; - Xml.pp ~gzip:true xml (Some xmlpath) ; + Xml.pp ~gzip:true xml (Some xmlpath); + CicUniv.write_xml_of_ugraph xmlunivgraphpath ugraph univlist; (* we return a list of uri,path we registered/created *) - (uri,xmlpath) :: (innertypesuri,innertypespath) :: + (uri,xmlpath) :: (innertypesuri,innertypespath) :: + (univgraphuri,xmlunivgraphpath) :: (* now the optional body, both write and register *) (match bodyxml,bodyuri with None,None -> [] @@ -150,17 +157,33 @@ let save_object_to_disk status uri obj = [bodyuri, xmlbodypath] | _-> assert false) +let typecheck_obj = + let profiler = CicUtil.profile "add_obj.typecheck_obj" in + fun uri obj -> profiler.CicUtil.profile (CicTypeChecker.typecheck_obj uri) obj + +let index_obj = + let profiler = CicUtil.profile "add_obj.index_obj" in + fun ~dbd ~uri -> + profiler.CicUtil.profile (fun uri -> MetadataDb.index_obj ~dbd ~uri) uri + +let save_object_to_disk = + let profiler = CicUtil.profile "add_obj.save_object_to_disk" in + fun status uri obj ugraph univlist -> + profiler.CicUtil.profile (save_object_to_disk status uri obj ugraph) univlist + let add_obj uri obj status = let dbd = MatitaDb.instance () in let suri = UriManager.string_of_uri uri in if CicEnvironment.in_library uri then command_error (sprintf "%s already defined" suri) else begin - CicTypeChecker.typecheck_obj uri obj; (* 1 *) + typecheck_obj uri obj; (* 1 *) + let _, ugraph, univlist = + CicEnvironment.get_cooked_obj_with_univlist CicUniv.empty_ugraph uri in try - MetadataDb.index_obj ~dbd ~uri; (* 2 must be in the env *) + index_obj ~dbd ~uri; (* 2 must be in the env *) try - let new_stuff = save_object_to_disk status uri obj in (* 3 *) + let new_stuff=save_object_to_disk status uri obj ugraph univlist in(*3*) try MatitaLog.message (sprintf "%s defined" suri); let status = add_aliases_for_object status suri obj in @@ -174,7 +197,7 @@ let add_obj uri obj status = raise exc with exc -> CicEnvironment.remove_obj uri; (* -1 *) - raise exc + raise exc end let add_obj = @@ -263,12 +286,15 @@ let time_travel ~present ~past = List.iter MatitaLog.debug l2 *) -let remove ~verbose uri = +let last_baseuri = ref "" + +let remove ?(verbose=false) uri = let derived_uris_of_uri uri = UriManager.innertypesuri_of_uri uri :: + UriManager.univgraphuri_of_uri uri :: (match UriManager.bodyuri_of_uri uri with | None -> [] - | Some u -> [u]) + | Some u -> [u]) in let to_remove = uri :: @@ -278,8 +304,14 @@ let remove ~verbose uri = List.iter (fun uri -> (try + (* WARNING: non reentrant debugging code *) if verbose then - MatitaLog.debug ("Removing: " ^ UriManager.string_of_uri uri); + let baseuri = UriManager.buri_of_uri uri in + if !last_baseuri <> baseuri then + begin + MatitaLog.debug ("Removing: " ^ baseuri ^ "/*"); + last_baseuri := baseuri + end; MatitaMisc.safe_remove (Http_getter.resolve' uri) with Http_getter_types.Key_not_found _ -> ()); remove_coercion uri;