X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitaDisambiguator.ml;h=4fe206f74618953b4ed9d5110cbd553ab77d2397;hb=6627bb6bb1c3ae3ce70bcfe4d59997a94bec8b18;hp=fe9cdca761785a081c3ae18e84addbe68bd27ae9;hpb=49430a1d657ec9521619ea35fe911b598f055df9;p=helm.git

diff --git a/helm/matita/matitaDisambiguator.ml b/helm/matita/matitaDisambiguator.ml
index fe9cdca76..4fe206f74 100644
--- a/helm/matita/matitaDisambiguator.ml
+++ b/helm/matita/matitaDisambiguator.ml
@@ -68,14 +68,18 @@ module Disambiguator = Disambiguate.Make (Callbacks)
 
 (* implement module's API *)
 
-let disambiguate_thing ~aliases
-  ~(f:?fresh_instances:bool -> aliases:Disambiguate.aliases -> 'a -> 'b)
+let disambiguate_thing ~aliases ~universe
+  ~(f:?fresh_instances:bool ->
+      aliases:DisambiguateTypes.environment ->
+      universe:DisambiguateTypes.multiple_environment option ->
+      'a -> 'b)
   ~(set_aliases: DisambiguateTypes.environment -> 'b -> 'b)
   (thing: 'a)
 =
-  let library = true, DisambiguateTypes.empty_environment in
-  let multi_aliases = true, aliases in
-  let mono_aliases = false, aliases in
+  assert (universe <> None);
+  let library = false, DisambiguateTypes.Environment.empty, None in
+  let multi_aliases=false, DisambiguateTypes.Environment.empty, universe in
+  let mono_aliases = true, aliases, None in
   let passes =  (* <fresh_instances?, aliases, coercions?> *)
     [ (false, mono_aliases, false);
       (false, multi_aliases, false);
@@ -86,12 +90,12 @@ let disambiguate_thing ~aliases
       (true, library, true);
     ]
   in
-  let try_pass (fresh_instances, aliases, use_coercions) =
+  let try_pass (fresh_instances, (_, aliases, universe), use_coercions) =
     CoercDb.use_coercions := use_coercions;
-    f ~fresh_instances ~aliases thing
+    f ~fresh_instances ~aliases ~universe thing
   in
-  let set_aliases (_,(use_multi_aliases,_),_) (_, user_asked as res) =
-   if not use_multi_aliases then
+  let set_aliases (instances,(use_mono_aliases,_,_),_) (_, user_asked as res) =
+   if use_mono_aliases && not instances then
     res
    else if user_asked then
     res (* one shot aliases *)
@@ -116,17 +120,42 @@ let disambiguate_thing ~aliases
     CoercDb.use_coercions := saved_use_coercions;
     raise exn
 
+let disambiguate_thing =
+ let profiler = CicUtil.profile "disambiguate_thing" in
+  fun ~aliases ~universe
+      ~(f:?fresh_instances:bool ->
+          aliases:DisambiguateTypes.environment ->
+          universe:DisambiguateTypes.multiple_environment option ->
+          'a -> 'b)
+      ~(set_aliases: DisambiguateTypes.environment -> 'b -> 'b)
+      (thing: 'a)
+  -> profiler.CicUtil.profile
+      (disambiguate_thing ~aliases ~universe ~f ~set_aliases) thing
+
+let disambiguate_thing ~aliases ~universe
+  ~(f:?fresh_instances:bool ->
+      aliases:DisambiguateTypes.environment ->
+      universe:DisambiguateTypes.multiple_environment option ->
+      'a -> 'b)
+  ~(set_aliases: DisambiguateTypes.environment -> 'b -> 'b)
+  (thing: 'a)
+=
+  Obj.magic disambiguate_thing ~aliases ~universe ~f ~set_aliases thing
+
 let set_aliases aliases (choices, user_asked) =
   (List.map (fun (_, a, b, c) -> aliases, a, b, c) choices),
   user_asked
 
-let disambiguate_term ~dbd ~context ~metasenv ?initial_ugraph ~aliases term =
+let disambiguate_term ?fresh_instances ~dbd ~context ~metasenv ?initial_ugraph
+  ~aliases ~universe term
+ =
+  assert (fresh_instances = None);
   let f =
     Disambiguator.disambiguate_term ~dbd ~context ~metasenv ?initial_ugraph
   in
-  disambiguate_thing ~aliases ~f ~set_aliases term
+  disambiguate_thing ~aliases ~universe ~f ~set_aliases term
 
-let disambiguate_obj ~dbd ~aliases ~uri obj =
+let disambiguate_obj ?fresh_instances ~dbd ~aliases ~universe ~uri obj =
+  assert (fresh_instances = None);
   let f = Disambiguator.disambiguate_obj ~dbd ~uri in
-  disambiguate_thing ~aliases ~f ~set_aliases obj
-
+  disambiguate_thing ~aliases ~universe ~f ~set_aliases obj