X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateChoices.ml;h=71e32042876088adcb2ffe74b9b05990eee25395;hb=a56837c8e421a9d1e71566bde12ea8cc1518cfba;hp=c660bb6b0a19895cd455ecdd08acf650097704b3;hpb=6f2724b64f78339cc7b652e9514813c1705605b0;p=helm.git diff --git a/helm/ocaml/cic_disambiguation/disambiguateChoices.ml b/helm/ocaml/cic_disambiguation/disambiguateChoices.ml index c660bb6b0..71e320428 100644 --- a/helm/ocaml/cic_disambiguation/disambiguateChoices.ml +++ b/helm/ocaml/cic_disambiguation/disambiguateChoices.ml @@ -51,16 +51,17 @@ let mk_choice (dsc, args, appl_pattern) = in try List.combine names cic_args - with Invalid_argument _ -> raise Invalid_choice + with Invalid_argument _ -> + raise (Invalid_choice (lazy "The notation expects a different number of arguments")) in - CicNotationFwd.instantiate_appl_pattern env' appl_pattern) + TermAcicContent.instantiate_appl_pattern env' appl_pattern) let lookup_symbol_by_dsc symbol dsc = try mk_choice (List.find (fun (dsc', _, _) -> dsc = dsc') - (CicNotationRew.lookup_interpretations symbol)) - with CicNotationRew.Interpretation_not_found | Not_found -> + (TermAcicContent.lookup_interpretations symbol)) + with TermAcicContent.Interpretation_not_found | Not_found -> raise (Choice_not_found (lazy (sprintf "Symbol %s, dsc %s" symbol dsc)))