X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Fdisambiguate.mli;h=5de2e5759eaa6c2a68ce3da74b746e2e7241db7a;hb=33a02e0b639217093eb63f30169aaa6ac8c78907;hp=5f797ab5dbbfb1ef12b0096aba811a541ac53a77;hpb=358d1d55044347255aacb8daf03de0dbb18bc668;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguate.mli b/helm/ocaml/cic_disambiguation/disambiguate.mli
index 5f797ab5d..5de2e5759 100644
--- a/helm/ocaml/cic_disambiguation/disambiguate.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguate.mli
@@ -23,37 +23,70 @@
  * http://helm.cs.unibo.it/
  *)
 
-open Disambiguate_types
+(** {2 Disambiguation interface} *)
 
-  (* TODO move to  CicSomething *)
-val term_of_uri: string -> Cic.term
+exception NoWellTypedInterpretation
+exception PathNotWellFormed
 
-(** {2 Choice registration interface} *)
+val interpretate_path :
+  context:Cic.name list -> DisambiguateTypes.term ->
+    Cic.term
 
-  (** to be raised when a choice is invalid due to some given parameter (e.g.
-   * wrong number of Cic.term arguments received) *)
-exception Invalid_choice
+  (** @param multi true if multi aliases are used, false otherwise *)
+type aliases = bool * DisambiguateTypes.environment
 
-  (** register a new symbol choice *)
-val add_symbol_choice: string -> codomain_item -> unit
+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:Mysql.dbd ->
+    context:Cic.context ->
+    metasenv:Cic.metasenv ->
+    ?initial_ugraph:CicUniv.universe_graph -> 
+    aliases:aliases ->               (* 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? *)
 
-  (** register a new number choice *)
-val add_num_choice: codomain_item -> unit
+  (** @param fresh_instances as per disambiguate_term *)
+  val disambiguate_obj :
+    ?fresh_instances:bool ->
+    dbd:Mysql.dbd ->
+    aliases:aliases ->               (* 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? *)
+end
 
-(** {2 Disambiguation interface} *)
+module Make (C : DisambiguateTypes.Callbacks) : Disambiguator
 
-exception NoWellTypedInterpretation
+module Trivial:
+sig
+  exception Ambiguous_term of string
 
-module Make (C : Callbacks) :
-  sig
-    val disambiguate_term :
-      MQIConn.handle ->
-      Cic.context ->
-      Cic.metasenv ->
-      Ast.term ->
-      aliases:environment ->  (* previous interpretation status *)
-        environment *                   (* new interpretation status *)
-        Cic.metasenv *                  (* new metasenv *)
-        Cic.term                        (* disambiguated term *)
-  end
+  (** 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 ->
+    ?context:Cic.context ->
+    ?metasenv:Cic.metasenv ->
+    ?initial_ugraph:CicUniv.universe_graph -> 
+    ?aliases:DisambiguateTypes.environment ->(* previous interpretation status*)
+    string ->
+    (DisambiguateTypes.environment * (* new interpretation status *)
+     Cic.metasenv *                 (* new metasenv *)
+     Cic.term *
+     CicUniv.universe_graph) list   (* disambiguated term *)
+end