# HG changeset patch # User wenzelm # Date 1192622137 -7200 # Node ID 0f19e65ac0b6237c034bdf5be54d54acb2727d70 # Parent 344b9611c1505226350451b11425f41761621678 clarified naming conventions of 'parse' and 'check' (as opposed to former 'cert'); diff -r 344b9611c150 -r 0f19e65ac0b6 src/Pure/Isar/locale.ML --- a/src/Pure/Isar/locale.ML Wed Oct 17 13:55:35 2007 +0200 +++ b/src/Pure/Isar/locale.ML Wed Oct 17 13:55:37 2007 +0200 @@ -2077,7 +2077,7 @@ add_local_equation x; -fun prep_instantiations prep_term prep_prop ctxt parms (insts, eqns) = +fun prep_instantiations parse_term parse_prop ctxt parms (insts, eqns) = let (* parameters *) val (parm_names, parm_types) = parms |> split_list @@ -2105,11 +2105,11 @@ |> split_list; val (given_parm_names, given_parm_types) = given_ps |> split_list; - (* prepare insts / eqns *) - val given_insts' = map (prep_term ctxt) given_insts; - val eqns' = map (prep_prop ctxt) eqns; - - (* infer types *) + (* parse insts / eqns *) + val given_insts' = map (parse_term ctxt) given_insts; + val eqns' = map (parse_prop ctxt) eqns; + + (* type inference etc. *) val res = Syntax.check_terms ctxt (type_parms @ map2 TypeInfer.constrain given_parm_types given_insts' @ @@ -2125,7 +2125,7 @@ in ((instT, inst), eqns'') end; val read_instantiations = prep_instantiations Syntax.parse_term Syntax.parse_prop; -val cert_instantiations = prep_instantiations (K I) (K I); +val check_instantiations = prep_instantiations (K I) (K I); fun gen_prep_registration mk_ctxt test_reg activate prep_attr prep_expr prep_insts @@ -2208,12 +2208,12 @@ val prep_global_registration = gen_prep_global_registration Attrib.intern_src intern_expr read_instantiations; val prep_global_registration_i = gen_prep_global_registration - (K I) (K I) cert_instantiations; + (K I) (K I) check_instantiations; val prep_local_registration = gen_prep_local_registration Attrib.intern_src intern_expr read_instantiations; val prep_local_registration_i = gen_prep_local_registration - (K I) (K I) cert_instantiations; + (K I) (K I) check_instantiations; fun prep_registration_in_locale target expr thy = (* target already in internal form *)