X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaDisambiguator.mli;h=64cd5563b1d691d6035b54c03f03607f35b976fb;hb=7c123bfb1568f90f37cd667332fbf60d4423b983;hp=a5d0aed44e465d9f5c3ca4cf783ff70e0071e166;hpb=aa6153d8e480abfe52b00e1bc6bd48ef84c48988;p=helm.git

diff --git a/helm/matita/matitaDisambiguator.mli b/helm/matita/matitaDisambiguator.mli
index a5d0aed44..64cd5563b 100644
--- a/helm/matita/matitaDisambiguator.mli
+++ b/helm/matita/matitaDisambiguator.mli
@@ -28,6 +28,8 @@ open MatitaTypes
 (** raised when ambiguous input is found but not expected (e.g. in the batch
   * compiler) *)
 exception Ambiguous_input
+exception DisambiguationError of
+ (Token.flocation option * string Lazy.t) list list
 
 type choose_uris_callback = id:string -> UriManager.uri list -> UriManager.uri list
 type choose_interp_callback = (string * string) list list -> int list
@@ -47,28 +49,4 @@ val mono_interp_callback: choose_interp_callback
 
 (** for GUI callbacks see MatitaGui.interactive_{interp,user_uri}_choice *)
 
-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? *)
-
+include Disambiguate.Disambiguator