X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=1eade4ca09850d1b6d6636d5b3bb8e203142e5ee;hb=eaf5880ed69963b3ad37cb1f8a1fd48b2918e58b;hp=a360dde384dfd87655864467bcbd8211beb0ab08;hpb=c7db77feacfdb97e16dd22a22d773e406329c501;p=helm.git diff --git a/helm/software/components/cic_disambiguation/disambiguateTypes.ml b/helm/software/components/cic_disambiguation/disambiguateTypes.ml index a360dde38..1eade4ca0 100644 --- 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 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