The new_aliases argument of the functions alias_diff and set_proof_aliases

[helm.git] / helm / matita / matitaSync.ml

diff --git a/helm/matita/matitaSync.ml b/helm/matita/matitaSync.ml
index 5f1f5b6c29e676ac84cb49ac7595f9df3c9ee7e4..3351725db23b5be93a1274a3ed0cf26ab6746679 100644 (file)
--- a/helm/matita/matitaSync.ml
+++ b/helm/matita/matitaSync.ml
@@ -34,29 +34,39 @@ 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 "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
+
+let compute_diff_and_set_proof_aliases status aliases =
+ let new_status = { status with aliases = aliases } in
+ let diff = alias_diff ~from:status new_status in
+  set_proof_aliases status diff
   
 (** given a uri and a type list (the contructors types) builds a list of pairs
  *  (name,uri) that is used to generate authomatic aliases **)
@@ -72,19 +82,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 =