The library is no longer automatically used during disambiguation.

[helm.git] / helm / software / components / disambiguation / multiPassDisambiguator.mli

diff --git a/helm/software/components/disambiguation/multiPassDisambiguator.mli b/helm/software/components/disambiguation/multiPassDisambiguator.mli
index 7a4ae53aacad74b9f1659f38a52392e414451b3d..21818816ca6d405d9fd8ce06d552b4744a6d29f2 100644 (file)
--- a/helm/software/components/disambiguation/multiPassDisambiguator.mli
+++ b/helm/software/components/disambiguation/multiPassDisambiguator.mli
@@ -23,9 +23,6 @@
  * http://helm.cs.unibo.it/
  *)
 
-(** raised when ambiguous input is found but not expected (e.g. in the batch
-  * compiler) *)
-exception Ambiguous_input
 (* the integer is an offset to be added to each location *)
 exception DisambiguationError of
  int *
@@ -36,55 +33,39 @@ exception DisambiguationError of
 
 (** initially false; for debugging only (???) *)
 val only_one_pass: bool ref
+val use_library: bool ref
 
 val passes : unit -> (bool * [> `Library | `Mono | `Multi ] * bool) list
 
-val set_choose_uris_callback:
-  DisambiguateTypes.interactive_user_uri_choice_type -> unit
-
-val set_choose_interp_callback:
-  DisambiguateTypes.interactive_interpretation_choice_type -> unit
-
-(** @raise Ambiguous_input if called, default value for internal
-  * choose_uris_callback if not set otherwise with set_choose_uris_callback
-  * above *)
-val mono_uris_callback: DisambiguateTypes.interactive_user_uri_choice_type
-
-(** @raise Ambiguous_input if called, default value for internal
-  * choose_interp_callback if not set otherwise with set_choose_interp_callback
-  * above *)
-val mono_interp_callback: DisambiguateTypes.interactive_interpretation_choice_type
-
 val disambiguate_thing:
   passes:(bool * [ `Library | `Mono | `Multi ] * bool) list ->
   freshen_thing: ('ast_thing -> 'ast_thing) ->
   context:'context ->
   metasenv:'metasenv ->
   subst:'subst ->
-  mk_implicit:(bool -> 'refined_term) ->
   string_context_of_context:('context -> string option list) ->
   initial_ugraph:'ugraph ->
   hint: 
     ('metasenv -> 'raw_thing -> 'raw_thing) * 
     (('refined_thing,'metasenv,'subst,'ugraph) Disambiguate.test_result ->
        ('refined_thing,'metasenv,'subst,'ugraph) Disambiguate.test_result) ->
-  aliases:'refined_term DisambiguateTypes.codomain_item 
-    DisambiguateTypes.Environment.t ->
-  universe:'refined_term DisambiguateTypes.codomain_item list
+  mk_implicit:(bool -> 'alias) ->
+  description_of_alias:('alias -> string) ->
+  aliases:'alias DisambiguateTypes.Environment.t ->
+  universe:'alias list
     DisambiguateTypes.Environment.t option ->
   lookup_in_library:(
     DisambiguateTypes.interactive_user_uri_choice_type ->
     DisambiguateTypes.input_or_locate_uri_type ->
     DisambiguateTypes.Environment.key ->
-    'refined_term DisambiguateTypes.codomain_item list) ->
+    'alias list) ->
   uri:'uri ->
   pp_thing:('ast_thing -> string) ->
   domain_of_thing:
    (context: string option list -> 'ast_thing -> Disambiguate.domain) ->
   interpretate_thing:(
     context:'context ->
-    env:'refined_term DisambiguateTypes.codomain_item
-           DisambiguateTypes.Environment.t ->
+    env:'alias DisambiguateTypes.Environment.t ->
     uri:'uri ->
     is_path:bool -> 
     'ast_thing -> 
@@ -94,9 +75,8 @@ val disambiguate_thing:
     'metasenv -> 'subst -> 'context -> 'uri -> use_coercions:bool ->
     'raw_thing -> 'ugraph -> localization_tbl:'cichash -> 
       ('refined_thing, 'metasenv,'subst,'ugraph) Disambiguate.test_result) ->
-  localization_tbl:'cichash ->
+  mk_localization_tbl:(int -> 'cichash) ->
   string * int * 'ast_thing ->
-  ((DisambiguateTypes.Environment.key * 
-    'refined_term DisambiguateTypes.codomain_item) list * 
+  ((DisambiguateTypes.Environment.key * 'alias) list * 
    'metasenv * 'subst * 'refined_thing * 'ugraph)
   list * bool