X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Fdisambiguate.mli;h=e8d21c0cda5f98c57b74aa845a4e3e831217393f;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=4db990283b919825430810a363e28d5e0e390dda;hpb=a1b3b062ef799002baf9f21c6e5850b190af5977;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguate.mli b/helm/ocaml/cic_disambiguation/disambiguate.mli
index 4db990283..e8d21c0cd 100644
--- a/helm/ocaml/cic_disambiguation/disambiguate.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguate.mli
@@ -23,42 +23,67 @@
  * http://helm.cs.unibo.it/
  *)
 
-open DisambiguateTypes
-
 (** {2 Disambiguation interface} *)
 
-exception NoWellTypedInterpretation
+exception NoWellTypedInterpretation of string Lazy.t list
+exception PathNotWellFormed
+
+val interpretate_path :
+  context:Cic.name list -> DisambiguateTypes.term ->
+    Cic.term
+
+module type Disambiguator =
+sig
+  (** @param fresh_instances when set to true fresh instances will be generated
+   * for each number _and_ symbol in the disambiguation domain. Instances of the
+   * input AST will be ignored. Defaults to false. *)
+  val disambiguate_term :
+    ?fresh_instances:bool ->
+    dbd:HMysql.dbd ->
+    context:Cic.context ->
+    metasenv:Cic.metasenv ->
+    ?initial_ugraph:CicUniv.universe_graph -> 
+    aliases:DisambiguateTypes.environment ->(* previous interpretation status *)
+    universe:DisambiguateTypes.multiple_environment option ->
+    DisambiguateTypes.term ->
+    ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list *
+     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 :
+    ?fresh_instances:bool ->
+    dbd:HMysql.dbd ->
+    aliases:DisambiguateTypes.environment ->(* previous interpretation status *)
+    universe:DisambiguateTypes.multiple_environment option ->
+    uri:UriManager.uri option ->     (* required only for inductive types *)
+    GrafiteAst.obj ->
+    ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list *
+     Cic.metasenv *                  (* new metasenv *)
+     Cic.obj *
+     CicUniv.universe_graph) list *  (* disambiguated obj *)
+    bool  (* has interactive_interpretation_choice been invoked? *)
+end
 
-module Make (C : Callbacks) :
-  sig
-    val disambiguate_term :
-      dbd:Mysql.dbd ->
-      Cic.context ->
-      Cic.metasenv ->
-      CicAst.term ->
-      ?initial_ugraph:CicUniv.universe_graph -> 
-      aliases:environment ->  (* previous interpretation status *)
-      (environment *                   (* new interpretation status *)
-       Cic.metasenv *                  (* new metasenv *)
-       Cic.term*
-       CicUniv.universe_graph) list    (* disambiguated term *)
-  end
+module Make (C : DisambiguateTypes.Callbacks) : Disambiguator
 
 module Trivial:
 sig
-  exception Ambiguous_term of string
+  exception Ambiguous_term of string Lazy.t
 
   (** disambiguate an _unanmbiguous_ term using dummy callbacks which fail if a
     * choice from the user is needed to disambiguate the term
     * @raise Ambiguous_term for ambiguous term *)
   val disambiguate_string:
-    dbd:Mysql.dbd ->
-    Cic.context ->
-    Cic.metasenv ->
+    dbd:HMysql.dbd ->
+    ?context:Cic.context ->
+    ?metasenv:Cic.metasenv ->
     ?initial_ugraph:CicUniv.universe_graph -> 
-    ?aliases:environment ->         (* previous interpretation status *)
+    ?aliases:DisambiguateTypes.environment ->(* previous interpretation status*)
     string ->
-    (environment *                  (* new interpretation status *)
+    ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list *
      Cic.metasenv *                 (* new metasenv *)
      Cic.term *
      CicUniv.universe_graph) list   (* disambiguated term *)