nominal2: comparison Nominal/Parser.thy

equal deleted inserted replaced

-:51bc795b81fd
+:0b2535a72fd0
 fun find [] _ = error ("cannot find element")
 | find ((x, z)::xs) y = if (Long_Name.base_name x) = y then z else find xs y
 *}
 ML {*
-fun strip_union t =
+fun strip_bn_fun t =
 case t of
-Const (@{const_name sup}, _) $ l $ r => strip_union l @ strip_union r
+Const (@{const_name sup}, _) $ l $ r => strip_bn_fun l @ strip_bn_fun r
-| (h as (Const (@{const_name insert}, T))) $ x $ y =>
+| Const (@{const_name append}, _) $ l $ r => strip_bn_fun l @ strip_bn_fun r
-(h $ x $ Const (@{const_name bot}, range_type (range_type T))) :: strip_union y
+| Const (@{const_name insert}, _) $ (Const (@{const_name atom}, _) $ Bound i) $ y =>
+(i, NONE) :: strip_bn_fun y
+| Const (@{const_name Cons}, _) $ (Const (@{const_name atom}, _) $ Bound i) $ y =>
+(i, NONE) :: strip_bn_fun y
 | Const (@{const_name bot}, _) => []
-| _ => [t]
+| Const (@{const_name Nil}, _) => []
-*}
+| (f as Free _) $ Bound i => [(i, SOME f)]
+| _ => error ("Unsupported binding function: " ^ (PolyML.makestring t))
-ML {*
-fun bn_or_atom t =
-case t of
-Const (@{const_name insert}, _) $ (Const (@{const_name atom}, _) $ Bound i) $
-Const (@{const_name bot}, _) => (i, NONE)
-| f $ Bound i => (i, SOME f)
-| _ => error "Unsupported binding function"
 *}
 ML {*
 fun prep_bn dt_names dts eqs =
 let
 val (bn_fun, [cnstr]) = strip_comb lhs
 val (_, ty) = dest_Free bn_fun
 val (ty_name, _) = dest_Type (domain_type ty)
 val dt_index = find_index (fn x => x = ty_name) dt_names
 val (cnstr_head, cnstr_args) = strip_comb cnstr
-val rhs_elements = map bn_or_atom (strip_union rhs)
+val rhs_elements = strip_bn_fun rhs
 val included = map (apfst (fn i => length (cnstr_args) - i - 1)) rhs_elements
 in
 (dt_index, (bn_fun, (cnstr_head, included)))
 end
 fun order dts i ts =
 val rel_dtinfos = List.take (dtinfos, (length dts));
 val inject = flat (map #inject dtinfos);
 val distincts = flat (map #distinct dtinfos);
 val rel_distinct = map #distinct rel_dtinfos;
 val induct = #induct dtinfo;
-val inducts = #inducts dtinfo;
 val exhausts = map #exhaust dtinfos;
 val _ = tracing "Defining permutations, fv and alpha";
 val ((raw_perm_def, raw_perm_simps, perms), lthy3) =
 Local_Theory.theory_result (define_raw_perms dtinfo (length dts)) lthy2;
 val raw_binds_flat = map (map flat) raw_binds;
 else build_equivps alpha_ts reflps alpha_induct
 inject alpha_eq_iff distincts alpha_cases alpha_eqvt lthy6;
 val qty_binds = map (fn (_, b, _, _) => b) dts;
 val qty_names = map Name.of_binding qty_binds;
 val qty_full_names = map (Long_Name.qualify thy_name) qty_names
-val lthy7 = define_quotient_type
+val (qtys, lthy7) = define_quotient_types qty_binds all_typs alpha_ts_nobn alpha_equivp lthy6;
-(map (fn ((b, t), alpha) => (([], b, NoSyn), (t, alpha))) ((qty_binds ~~ all_typs) ~~ alpha_ts_nobn))
-(ALLGOALS (resolve_tac alpha_equivp)) lthy6;
 val const_names = map Name.of_binding (flat (map (fn (_, _, _, t) => map (fn (b, _, _) => b) t) dts));
 val raw_consts =
 flat (map (fn (i, (_, _, l)) =>
 map (fn (cname, dts) =>
 Const (cname, map (typ_of_dtyp descr sorts) dts --->
 typ_of_dtyp descr sorts (DtRec i))) l) descr);
-val (consts, const_defs, lthy8) = quotient_lift_consts_export (const_names ~~ raw_consts) lthy7;
+val (consts, const_defs, lthy8) = quotient_lift_consts_export qtys (const_names ~~ raw_consts) lthy7;
-(* Could be done nicer *)
-val q_tys = distinct (op =) (map (snd o strip_type o fastype_of) consts);
 val _ = tracing "Proving respects";
 val bns_rsp_pre' = build_fvbv_rsps alpha_ts alpha_induct raw_bn_eqs (map fst bns) lthy8;
+val _ = map tracing (map PolyML.makestring bns_rsp_pre')
 val (bns_rsp_pre, lthy9) = fold_map (
-fn (bn_t, i) => prove_const_rsp Binding.empty [bn_t] (fn _ =>
+fn (bn_t, i) => prove_const_rsp qtys Binding.empty [bn_t] (fn _ =>
 resolve_tac bns_rsp_pre' 1)) bns lthy8;
 val bns_rsp = flat (map snd bns_rsp_pre);
 fun fv_rsp_tac _ = if !cheat_fv_rsp then Skip_Proof.cheat_tac thy
 else fvbv_rsp_tac alpha_induct fv_def lthy8 1;
 val fv_rsps = prove_fv_rsp fv_alpha_all alpha_ts fv_rsp_tac lthy9;
 val (fv_rsp_pre, lthy10) = fold_map
-(fn fv => fn ctxt => prove_const_rsp Binding.empty [fv]
+(fn fv => fn ctxt => prove_const_rsp qtys Binding.empty [fv]
 (fn _ => asm_simp_tac (HOL_ss addsimps fv_rsps) 1) ctxt) fv_ts lthy9;
 val fv_rsp = flat (map snd fv_rsp_pre);
-val (perms_rsp, lthy11) = prove_const_rsp Binding.empty perms
+val (perms_rsp, lthy11) = prove_const_rsp qtys Binding.empty perms
 (fn _ => asm_simp_tac (HOL_ss addsimps alpha_eqvt) 1) lthy10;
 val alpha_bn_rsp_pre = prove_alpha_bn_rsp alpha_ts alpha_induct (alpha_eq_iff @ rel_dists @ rel_dists_bn) alpha_equivp exhausts alpha_ts_bn lthy11;
-val (alpha_bn_rsps, lthy11a) = fold_map (fn cnst => prove_const_rsp Binding.empty [cnst]
+val (alpha_bn_rsps, lthy11a) = fold_map (fn cnst => prove_const_rsp qtys Binding.empty [cnst]
 (fn _ => asm_simp_tac (HOL_ss addsimps alpha_bn_rsp_pre) 1)) alpha_ts_bn lthy11
 (*  val _ = map tracing (map PolyML.makestring alpha_bn_rsps);*)
 fun const_rsp_tac _ =
 if !cheat_const_rsp then Skip_Proof.cheat_tac thy
 else let val alpha_alphabn = prove_alpha_alphabn alpha_ts alpha_induct alpha_eq_iff alpha_ts_bn lthy11a
 in constr_rsp_tac alpha_eq_iff (fv_rsp @ bns_rsp @ reflps @ alpha_alphabn) 1 end
-val (const_rsps, lthy12) = fold_map (fn cnst => prove_const_rsp Binding.empty [cnst]
+val (const_rsps, lthy12) = fold_map (fn cnst => prove_const_rsp qtys Binding.empty [cnst]
 const_rsp_tac) raw_consts lthy11a
 val qfv_names = map (unsuffix "_raw" o Long_Name.base_name o fst o dest_Const) ordered_fv_ts
-val (qfv_ts, qfv_defs, lthy12a) = quotient_lift_consts_export (qfv_names ~~ ordered_fv_ts) lthy12;
+val (qfv_ts, qfv_defs, lthy12a) = quotient_lift_consts_export qtys (qfv_names ~~ ordered_fv_ts) lthy12;
 val (qfv_ts_nobn, qfv_ts_bn) = chop (length perms) qfv_ts;
 val qbn_names = map (fn (b, _ , _) => Name.of_binding b) bn_funs
-val (qbn_defs, lthy12b) = fold_map Quotient_Def.quotient_lift_const (qbn_names ~~ raw_bn_funs) lthy12a;
+val (qbn_ts, qbn_defs, lthy12b) = quotient_lift_consts_export qtys (qbn_names ~~ raw_bn_funs) lthy12a;
 val qalpha_bn_names = map (unsuffix "_raw" o Long_Name.base_name o fst o dest_Const) alpha_ts_bn
-val (qalpha_ts_bn, qbn_defs, lthy12c) = quotient_lift_consts_export (qalpha_bn_names ~~ alpha_ts_bn) lthy12b;
+val (qalpha_ts_bn, qalphabn_defs, lthy12c) = quotient_lift_consts_export qtys (qalpha_bn_names ~~ alpha_ts_bn) lthy12b;
 val _ = tracing "Lifting permutations";
 val thy = Local_Theory.exit_global lthy12c;
 val perm_names = map (fn x => "permute_" ^ x) qty_names
-val thy' = define_lifted_perms qty_full_names (perm_names ~~ perms) raw_perm_simps thy;
+val thy' = define_lifted_perms qtys qty_full_names (perm_names ~~ perms) raw_perm_simps thy;
 val lthy13 = Theory_Target.init NONE thy';
 val q_name = space_implode "_" qty_names;
 fun suffix_bind s = Binding.qualify true q_name (Binding.name s);
 val _ = tracing "Lifting induction";
 val constr_names = map (Long_Name.base_name o fst o dest_Const) consts;
-val q_induct = Rule_Cases.name constr_names (lift_thm lthy13 induct);
+val q_induct = Rule_Cases.name constr_names (lift_thm qtys lthy13 induct);
 fun note_suffix s th ctxt =
 snd (Local_Theory.note ((suffix_bind s, []), th) ctxt);
 fun note_simp_suffix s th ctxt =
 snd (Local_Theory.note ((suffix_bind s, [Attrib.internal (K Simplifier.simp_add)]), th) ctxt);
 val (_, lthy14) = Local_Theory.note ((suffix_bind "induct",
 [Attrib.internal (K (Rule_Cases.case_names constr_names))]), [Rule_Cases.name constr_names q_induct]) lthy13;
 val q_inducts = Project_Rule.projects lthy13 (1 upto (length alpha_inducts)) q_induct
 val (_, lthy14a) = Local_Theory.note ((suffix_bind "inducts", []), q_inducts) lthy14;
-val q_perm = map (lift_thm lthy14) raw_perm_def;
+val q_perm = map (lift_thm qtys lthy14) raw_perm_def;
 val lthy15 = note_simp_suffix "perm" q_perm lthy14a;
-val q_fv = map (lift_thm lthy15) fv_def;
+val q_fv = map (lift_thm qtys lthy15) fv_def;
 val lthy16 = note_simp_suffix "fv" q_fv lthy15;
-val q_bn = map (lift_thm lthy16) raw_bn_eqs;
+val q_bn = map (lift_thm qtys lthy16) raw_bn_eqs;
 val lthy17 = note_simp_suffix "bn" q_bn lthy16;
 val _ = tracing "Lifting eq-iff";
 val eq_iff_unfolded1 = map (Local_Defs.unfold lthy17 @{thms alphas2}) alpha_eq_iff
 val eq_iff_unfolded2 = map (Local_Defs.unfold lthy17 @{thms alphas}) eq_iff_unfolded1
-val q_eq_iff_pre1 = map (lift_thm lthy17) eq_iff_unfolded2;
+val q_eq_iff_pre1 = map (lift_thm qtys lthy17) eq_iff_unfolded2;
 val q_eq_iff_pre2 = map (Local_Defs.fold lthy17 @{thms alphas2}) q_eq_iff_pre1
 val q_eq_iff = map (Local_Defs.fold lthy17 @{thms alphas}) q_eq_iff_pre2
 val (_, lthy18) = Local_Theory.note ((suffix_bind "eq_iff", []), q_eq_iff) lthy17;
-val q_dis = map (lift_thm lthy18) rel_dists;
+val q_dis = map (lift_thm qtys lthy18) rel_dists;
 val lthy19 = note_simp_suffix "distinct" q_dis lthy18;
-val q_eqvt = map (lift_thm lthy19) (bv_eqvt @ fv_eqvt);
+val q_eqvt = map (lift_thm qtys lthy19) (bv_eqvt @ fv_eqvt);
 val (_, lthy20) = Local_Theory.note ((Binding.empty,
 [Attrib.internal (fn _ => Nominal_ThmDecls.eqvt_add)]), q_eqvt) lthy19;
 val _ = tracing "Finite Support";
 val supports = map (prove_supports lthy20 q_perm) consts;
-val fin_supp = HOLogic.conj_elims (prove_fs lthy20 q_induct supports q_tys);
+val fin_supp = HOLogic.conj_elims (prove_fs lthy20 q_induct supports qtys);
 val thy3 = Local_Theory.exit_global lthy20;
 val lthy21 = Theory_Target.instantiation (qty_full_names, [], @{sort fs}) thy3;
 fun tac _ = Class.intro_classes_tac [] THEN (ALLGOALS (resolve_tac fin_supp))
 val lthy22 = Class.prove_instantiation_instance tac lthy21
 val fv_alpha_all = combine_fv_alpha_bns (qfv_ts_nobn, qfv_ts_bn) (alpha_ts_nobn, qalpha_ts_bn) bn_nos;
 in
 map_index (prep_typ binds) annos
 end
 in
-map (map (map (map (fn (a, b, c) => (a, b, c, !alpha_type)))))
+map (map (map (map (fn (a, b, c) => (a, b, c, if !alpha_type=AlphaLst andalso a = NONE then AlphaGen else !alpha_type)))))
 (map (map prep_binds) (extract_annos_binds (get_cnstrs dt_strs)))
 end
 *}
 ML {*

changeset 1688	0b2535a72fd0
parent 1685	721d92623c9d
child 1744	00680cea0dde