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 1a8dc4ac08bf02e00cc901799f967087d2519160..4d077f2f877f0c79314d2cb7b8884337e7454b05 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.mli
@@ -41,25 +41,24 @@ 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 *)
-  (singleton_environment -> string -> Cic.term list -> Cic.term)
+  (environment -> string -> Cic.term list -> Cic.term)
     (* environment, literal number, arguments as needed *)
 
-and environment = codomain_item list Environment.t
+and environment = codomain_item Environment.t
 
-and singleton_environment = codomain_item Environment.t
+type multiple_environment = codomain_item list Environment.t
 
 (* a simple case of extension of a disambiguation environment *)
-val singleton_env_of_list:
-  (string * string * Cic.term) list -> singleton_environment ->
-    singleton_environment
-
 val env_of_list:
-  (string * string * Cic.term) list -> environment ->
-    environment
+  (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
@@ -94,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