The disambiguation now returns the aliases diff. It used to return the

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

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index 644b492fa85c15b2c9f810db04e800616b0222fa..365f947c001a5c163efa811d046797c36d12197a 100644 (file)
--- a/helm/matita/matitaEngine.ml
+++ b/helm/matita/matitaEngine.ml
@@ -162,7 +162,7 @@ let singleton = function
 
 let disambiguate_term status_ref term =
   let status = !status_ref in
-  let (aliases, metasenv, cic, _) =
+  let (diff, metasenv, cic, _) =
     singleton
       (MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ())
         ~aliases:status.aliases ~universe:(Some status.multi_aliases)
@@ -170,7 +170,7 @@ let disambiguate_term status_ref term =
         ~metasenv:(MatitaMisc.get_proof_metasenv status) term)
   in
   let status = MatitaTypes.set_metasenv metasenv status in
-  let status = MatitaSync.compute_diff_and_set_proof_aliases status aliases in
+  let status = MatitaSync.set_proof_aliases status diff in
   status_ref := status;
   cic
   
@@ -182,14 +182,14 @@ let disambiguate_term status_ref term =
 let disambiguate_lazy_term status_ref term =
   (fun context metasenv ugraph ->
     let status = !status_ref in
-    let (aliases, metasenv, cic, ugraph) =
+    let (diff, metasenv, cic, ugraph) =
       singleton
         (MatitaDisambiguator.disambiguate_term ~dbd:(MatitaDb.instance ())
           ~initial_ugraph:ugraph ~aliases:status.aliases
           ~universe:(Some status.multi_aliases) ~context ~metasenv term)
     in
     let status = MatitaTypes.set_metasenv metasenv status in
-    let status = MatitaSync.compute_diff_and_set_proof_aliases status aliases in
+    let status = MatitaSync.set_proof_aliases status diff in
     status_ref := status;
     cic, metasenv, ugraph)
 
@@ -639,7 +639,7 @@ let disambiguate_obj status obj =
        Some (UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".ind"))
     | GrafiteAst.Inductive _ -> assert false
     | GrafiteAst.Theorem _ -> None in
-  let (aliases, metasenv, cic, _) =
+  let (diff, metasenv, cic, _) =
     singleton
       (MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ())
         ~aliases:status.aliases ~universe:(Some status.multi_aliases) ~uri obj)
@@ -652,7 +652,7 @@ let disambiguate_obj status obj =
     | Intermediate _ -> assert false
   in
   let status = { status with proof_status = proof_status } in
-  let status = MatitaSync.compute_diff_and_set_proof_aliases status aliases in
+  let status = MatitaSync.set_proof_aliases status diff in
   status, cic
   
 let disambiguate_command status = function