X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.mli;h=b6d74a7fd84ff0b4b98668f5dea7a37ad079ff55;hb=d1126c6b78a3333bbf415daf027004496b77c2f4;hp=58458d1ffa5d008618755828d766ae2ed454bbb1;hpb=5d4368413bdf9d8e670bab23b912994bc2f8459d;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
index 58458d1ff..b6d74a7fd 100644
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -31,6 +31,10 @@ type domain_item =
 (* module Domain:      Set.S with type elt = domain_item *)
 module Environment: Map.S with type key = domain_item
 
+  (** 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
+
 type codomain_item =
   string *  (* description *)
   (environment -> string -> Cic.term list -> Cic.term)
@@ -38,16 +42,26 @@ type codomain_item =
 
 and environment = codomain_item Environment.t
 
+(* a simple case of extension of a disambiguation environment *)
+val env_of_list: (string * string * Cic.term) list -> environment -> environment
+
 module type Callbacks =
   sig
+
     val interactive_user_uri_choice :
       selection_mode:[`SINGLE | `MULTIPLE] ->
       ?ok:string ->
       ?enable_button_for_non_vars:bool ->
-      title:string -> msg:string -> id:string -> string list -> string list
-    val interactive_interpretation_choice :
+      title:string -> msg:string -> id:string -> UriManager.uri list ->
+       UriManager.uri list
+
+      val interactive_interpretation_choice :
       (string * string) list list -> int list
-    val input_or_locate_uri : title:string -> UriManager.uri
+
+    (** @param title gtk window title for user prompting
+     * @param id unbound identifier which originated this callback invocation *)
+    val input_or_locate_uri:
+      title:string -> ?id:string -> unit -> UriManager.uri
   end
 
 val string_of_domain_item: domain_item -> string
@@ -55,9 +69,14 @@ val string_of_domain: domain_item list -> string
 
 (** {3 type shortands} *)
 
-type term = CicAst.term
-type tactic = (term, string) TacticAst.tactic
-type tactical = (term, string) TacticAst.tactic TacticAst.tactical
-type command = term CommandAst.command
-type script = term CommandAst.Script.script
+type term = CicNotationPt.term
+type tactic = (term, term, GrafiteAst.reduction, string) GrafiteAst.tactic
+type tactical = (term, term, GrafiteAst.reduction, string) GrafiteAst.tactical
+
+type script_entry =
+  | Command of tactical
+  | Comment of CicNotationPt.location * string
+type script = CicNotationPt.location * script_entry list
+
+val empty_environment: environment