ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_disambiguation / disambiguateTypes.mli

diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
index 2849a858ca88230e9b686b5165988a47ae2abd27..4d077f2f877f0c79314d2cb7b8884337e7454b05 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -29,7 +29,19 @@ type domain_item =
  | Num of int                 (* instance num *)
 
 (* module Domain:      Set.S with type elt = domain_item *)
-module Environment: Map.S with type key = domain_item
+module Environment:
+sig
+  include Map.S with type key = domain_item
+  val cons: domain_item -> ('a * 'b) -> ('a * 'b) list t -> ('a * 'b) list t
+  val hd: 'a list t -> 'a t
+
+    (** last alias cons-ed will be processed first *)
+  val fold_flatten: (domain_item -> 'a -> 'b -> 'b) -> 'a list t -> 'b -> 'b
+end
+
+  (** 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 of string Lazy.t
 
 type codomain_item =
   string *  (* description *)
@@ -38,6 +50,16 @@ type codomain_item =
 
 and environment = codomain_item Environment.t
 
+type multiple_environment = codomain_item list Environment.t
+
+(* a simple case of extension of a disambiguation environment *)
+val env_of_list:
+  (string * string * Cic.term) list -> environment -> environment
+
+val multiple_env_of_list:
+  (string * string * Cic.term) list -> multiple_environment ->
+    multiple_environment
+
 module type Callbacks =
   sig
 
@@ -45,14 +67,16 @@ module type Callbacks =
       selection_mode:[`SINGLE | `MULTIPLE] ->
       ?ok:string ->
       ?enable_button_for_non_vars:bool ->
-      title:string -> msg:string -> id:string -> string list -> string list
+      title:string -> msg:string -> id:string -> UriManager.uri list ->
+       UriManager.uri list
 
-    val interactive_interpretation_choice :
+      val interactive_interpretation_choice :
       (string * string) list list -> int list
 
     (** @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 -> UriManager.uri
+    val input_or_locate_uri:
+      title:string -> ?id:string -> unit -> UriManager.uri
   end
 
 val string_of_domain_item: domain_item -> string
@@ -60,9 +84,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 dummy_floc: Lexing.position * Lexing.position