disambiguation even more abstracted

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

diff --git a/helm/software/components/cic_disambiguation/disambiguateTypes.ml b/helm/software/components/cic_disambiguation/disambiguateTypes.ml
index a360dde384dfd87655864467bcbd8211beb0ab08..dae0542b904d0c2d99a0dac63fa5cfe5c96401a2 100644 (file)
--- a/helm/software/components/cic_disambiguation/disambiguateTypes.ml
+++ b/helm/software/components/cic_disambiguation/disambiguateTypes.ml
@@ -40,7 +40,7 @@ type domain_item =
   | Symbol of string * int     (* literal, instance num *)
   | Num of int                 (* instance num *)
 
-exception Invalid_choice of string Lazy.t
+exception Invalid_choice of (Stdpp.location * string) Lazy.t
 
 module OrderedDomain =
   struct
@@ -60,6 +60,9 @@ struct
       Symbol (sym,n) ->
        (try find k env
         with Not_found -> find (Symbol (sym,0)) env)
+    | Num n ->
+       (try find k env
+        with Not_found -> find (Num 0) env)
     | _ -> find k env
 
   let cons k v env =
@@ -82,14 +85,14 @@ struct
 
 end
 
-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
 
 
 (** adds a (name,uri) list l to a disambiguation environment e **)
@@ -113,7 +116,7 @@ module type Callbacks =
       UriManager.uri list
     val interactive_interpretation_choice:
       string -> int ->
-      (Token.flocation list * string * string) list list -> int list
+      (Stdpp.location list * string * string) list list -> int list
     val input_or_locate_uri:
       title:string -> ?id:string -> unit -> UriManager.uri option
   end