X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitaDisambiguator.mli;h=a5d0aed44e465d9f5c3ca4cf783ff70e0071e166;hb=6565cd51fb866a80838003cd65dc00e4d5a9814b;hp=6d251cc7a2ba031ac060ca69d0e32ad81bdcaab7;hpb=de9a83f286eee12117fb478ea2db18f7faebac9a;p=helm.git

diff --git a/helm/matita/matitaDisambiguator.mli b/helm/matita/matitaDisambiguator.mli
index 6d251cc7a..a5d0aed44 100644
--- a/helm/matita/matitaDisambiguator.mli
+++ b/helm/matita/matitaDisambiguator.mli
@@ -29,7 +29,7 @@ open MatitaTypes
   * compiler) *)
 exception Ambiguous_input
 
-type choose_uris_callback   = id:string -> string list -> string list
+type choose_uris_callback = id:string -> UriManager.uri list -> UriManager.uri list
 type choose_interp_callback = (string * string) list list -> int list
 
 val set_choose_uris_callback:   choose_uris_callback -> unit
@@ -47,8 +47,28 @@ val mono_interp_callback: choose_interp_callback
 
 (** for GUI callbacks see MatitaGui.interactive_{interp,user_uri}_choice *)
 
-include Disambiguate.Disambiguator
-  (*
-   * val disambiguate_term: ...
-   *)
+val disambiguate_term :
+  dbd:Mysql.dbd ->
+  context:Cic.context ->
+  metasenv:Cic.metasenv ->
+  ?initial_ugraph:CicUniv.universe_graph -> 
+  aliases:DisambiguateTypes.environment -> (* previous interpretation status *)
+  DisambiguateTypes.term ->
+  (DisambiguateTypes.environment * (* new interpretation status *)
+   Cic.metasenv *                  (* new metasenv *)
+   Cic.term *
+   CicUniv.universe_graph) list *  (* disambiguated term *)
+  bool  (* has interactive_interpretation_choice been invoked? *)
+
+(** @param fresh_instances as per disambiguate_term *)
+val disambiguate_obj :
+  dbd:Mysql.dbd ->
+  aliases:DisambiguateTypes.environment -> (* previous interpretation status *)
+  uri:UriManager.uri option ->     (* required only for inductive types *)
+  GrafiteAst.obj ->
+  (DisambiguateTypes.environment * (* new interpretation status *)
+   Cic.metasenv *                  (* new metasenv *)
+   Cic.obj *
+   CicUniv.universe_graph) list *  (* disambiguated obj *)
+  bool  (* has interactive_interpretation_choice been invoked? *)