...

[helm.git] / helm / software / components / cic_disambiguation / disambiguateTypes.mli

diff --git a/helm/software/components/cic_disambiguation/disambiguateTypes.mli b/helm/software/components/cic_disambiguation/disambiguateTypes.mli
index 4f4b3c3ecdb49d2d9acde5b8573dde45f968c214..c33013ee6aabc1447bfcfdf6d6ebea00b20aa3a2 100644 (file)
--- a/helm/software/components/cic_disambiguation/disambiguateTypes.mli
+++ b/helm/software/components/cic_disambiguation/disambiguateTypes.mli
@@ -41,24 +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 of string Lazy.t
+exception Invalid_choice of (Stdpp.location * string) Lazy.t
 
-type codomain_item =
+type 'term codomain_item =
   string *  (* description *)
-  (environment -> string -> Cic.term list -> Cic.term)
+  ('term environment -> string -> 'term list -> 'term)
     (* environment, literal number, arguments as needed *)
 
-and environment = codomain_item Environment.t
+and 'term environment = 'term codomain_item Environment.t
 
-type multiple_environment = codomain_item list Environment.t
+type 'term multiple_environment = 'term 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
+  (string * string * 'term) list -> 'term environment -> 'term environment
 
 val multiple_env_of_list:
-  (string * string * Cic.term) list -> multiple_environment ->
-    multiple_environment
+  (string * string * 'term) list -> 'term multiple_environment ->
+    'term multiple_environment
 
 module type Callbacks =
   sig
@@ -71,12 +71,13 @@ module type Callbacks =
        UriManager.uri list
 
       val interactive_interpretation_choice :
-      (string * string) list list -> int list
+        string -> int ->
+      (Stdpp.location list * 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 -> unit -> UriManager.uri
+      title:string -> ?id:string -> unit -> UriManager.uri option
   end
 
 val string_of_domain_item: domain_item -> string