X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fdisambiguation%2FmultiPassDisambiguator.mli;h=41b79c9b025b2ea73761cf5937f62be39e841396;hb=d0c7735ccdde99179105d56a8fafa22060aa6184;hp=27d5ca618fabde013d7e542684f814f805074a4f;hpb=9a9c5b863f68367119450ae7b806d454ba1265e3;p=helm.git

diff --git a/helm/software/components/disambiguation/multiPassDisambiguator.mli b/helm/software/components/disambiguation/multiPassDisambiguator.mli
index 27d5ca618..41b79c9b0 100644
--- a/helm/software/components/disambiguation/multiPassDisambiguator.mli
+++ b/helm/software/components/disambiguation/multiPassDisambiguator.mli
@@ -23,9 +23,8 @@
  * http://helm.cs.unibo.it/
  *)
 
-(** raised when ambiguous input is found but not expected (e.g. in the batch
-  * compiler) *)
-exception Ambiguous_input
+val debug: bool ref
+
 (* the integer is an offset to be added to each location *)
 exception DisambiguationError of
  int *
@@ -36,25 +35,10 @@ 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) ->
@@ -63,12 +47,10 @@ val disambiguate_thing:
   subst:'subst ->
   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) ->
+  expty: 'refined_thing option ->
   mk_implicit:(bool -> 'alias) ->
   description_of_alias:('alias -> string) ->
+  fix_instance:(DisambiguateTypes.domain_item -> 'alias list -> 'alias list) ->
   aliases:'alias DisambiguateTypes.Environment.t ->
   universe:'alias list
     DisambiguateTypes.Environment.t option ->
@@ -91,9 +73,9 @@ val disambiguate_thing:
       'raw_thing) ->
   refine_thing:(
     'metasenv -> 'subst -> 'context -> 'uri -> use_coercions:bool ->
-    'raw_thing -> 'ugraph -> localization_tbl:'cichash -> 
+    'raw_thing -> 'refined_thing option -> '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 * 'alias) list * 
    'metasenv * 'subst * 'refined_thing * 'ugraph)