now destruct takes an optional list of term rather than a sigle optional term

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

diff --git a/components/cic_disambiguation/disambiguateTypes.ml b/components/cic_disambiguation/disambiguateTypes.ml
index a360dde384dfd87655864467bcbd8211beb0ab08..1eade4ca09850d1b6d6636d5b3bb8e203142e5ee 100644 (file)
--- a/components/cic_disambiguation/disambiguateTypes.ml
+++ b/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 option * 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 =
@@ -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