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 b6d74a7fd84ff0b4b98668f5dea7a37ad079ff55..4d077f2f877f0c79314d2cb7b8884337e7454b05 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -29,11 +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
+exception Invalid_choice of string Lazy.t
 
 type codomain_item =
   string *  (* description *)
@@ -42,8 +50,15 @@ 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 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
@@ -78,5 +93,5 @@ type script_entry =
   | Comment of CicNotationPt.location * string
 type script = CicNotationPt.location * script_entry list
 
-val empty_environment: environment
+val dummy_floc: Lexing.position * Lexing.position