List.find (has_description dsc) !num_choices
with Not_found -> raise (Choice_not_found (lazy ("Num with dsc " ^ dsc)))
-let mk_choice ~mk_appl ~mk_implicit ~term_of_uri (dsc, args, appl_pattern)=
+let mk_choice ~mk_appl ~mk_implicit ~term_of_uri ~term_of_nref (dsc, args, appl_pattern)=
dsc,
`Sym_interp
(fun cic_args ->
in
let combined =
TermAcicContent.instantiate_appl_pattern
- ~mk_appl ~mk_implicit ~term_of_uri env' appl_pattern
+ ~mk_appl ~mk_implicit ~term_of_uri ~term_of_nref env' appl_pattern
in
match rest with
[] -> combined
| _::_ -> mk_appl (combined::rest))
-let lookup_symbol_by_dsc ~mk_appl ~mk_implicit ~term_of_uri symbol dsc =
+let lookup_symbol_by_dsc ~mk_appl ~mk_implicit ~term_of_uri ~term_of_nref symbol dsc =
+ let interpretations = TermAcicContent.lookup_interpretations ~sorted:false symbol in
try
- mk_choice ~mk_appl ~mk_implicit ~term_of_uri
- (List.find
- (fun (dsc', _, _) -> dsc = dsc')
- (TermAcicContent.lookup_interpretations symbol))
+ mk_choice ~mk_appl ~mk_implicit ~term_of_uri ~term_of_nref
+ (List.find (fun (dsc', _, _) -> dsc = dsc') interpretations)
with TermAcicContent.Interpretation_not_found | Not_found ->
raise (Choice_not_found (lazy (sprintf "Symbol %s, dsc %s" symbol dsc)))
| true -> Cic.Implicit (Some `Type)
| false -> Cic.Implicit None)
~mk_appl:(function (Cic.Appl l)::tl -> Cic.Appl (l@tl) | l -> Cic.Appl l)
- ~term_of_uri:CicUtil.term_of_uri
+ ~term_of_uri:CicUtil.term_of_uri ~term_of_nref:(fun _ -> assert false)
;;