X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fcic_disambiguation%2FdisambiguateChoices.ml;h=f0c7b373ff9da2f8b1082f7a163dfed780c4e453;hb=806ecbdd749ecf2a1cabff52b41cf748fe022401;hp=bc82e60ffa921156f319f91b2c3e08b27b0795f2;hpb=6cc401c4136bafb6515bd39d86db6b5a917318bf;p=helm.git diff --git a/helm/software/components/cic_disambiguation/disambiguateChoices.ml b/helm/software/components/cic_disambiguation/disambiguateChoices.ml index bc82e60ff..f0c7b373f 100644 --- a/helm/software/components/cic_disambiguation/disambiguateChoices.ml +++ b/helm/software/components/cic_disambiguation/disambiguateChoices.ml @@ -44,7 +44,7 @@ let lookup_num_by_dsc dsc = 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 -> @@ -68,16 +68,16 @@ let mk_choice ~mk_appl ~mk_implicit ~term_of_uri (dsc, args, appl_pattern)= 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 + 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))) @@ -87,5 +87,5 @@ let cic_lookup_symbol_by_dsc = lookup_symbol_by_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) ;;