# HG changeset patch # User haftmann # Date 1281441998 -7200 # Node ID 0028571ade2d32a469f05671d1c4a40d53f67475 # Parent a062fdf777df8f2d3a7436b74e7e91855a9093cc split off structure Generic_Target into separate file diff -r a062fdf777df -r 0028571ade2d src/Pure/IsaMakefile --- a/src/Pure/IsaMakefile Tue Aug 10 13:58:26 2010 +0200 +++ b/src/Pure/IsaMakefile Tue Aug 10 14:06:38 2010 +0200 @@ -62,10 +62,10 @@ General/yxml.ML Isar/args.ML Isar/attrib.ML Isar/auto_bind.ML \ Isar/calculation.ML Isar/class.ML Isar/class_target.ML Isar/code.ML \ Isar/constdefs.ML Isar/context_rules.ML Isar/element.ML \ - Isar/expression.ML Isar/isar_cmd.ML Isar/isar_document.ML \ - Isar/isar_syn.ML Isar/keyword.ML Isar/local_defs.ML \ - Isar/local_syntax.ML Isar/local_theory.ML Isar/locale.ML \ - Isar/method.ML Isar/object_logic.ML Isar/obtain.ML \ + Isar/expression.ML Isar/generic_target.ML Isar/isar_cmd.ML \ + Isar/isar_document.ML Isar/isar_syn.ML Isar/keyword.ML \ + Isar/local_defs.ML Isar/local_syntax.ML Isar/local_theory.ML \ + Isar/locale.ML Isar/method.ML Isar/object_logic.ML Isar/obtain.ML \ Isar/outer_syntax.ML Isar/overloading.ML Isar/parse.ML \ Isar/parse_spec.ML Isar/parse_value.ML Isar/proof.ML \ Isar/proof_context.ML Isar/proof_display.ML Isar/proof_node.ML \ diff -r a062fdf777df -r 0028571ade2d src/Pure/Isar/theory_target.ML --- a/src/Pure/Isar/theory_target.ML Tue Aug 10 13:58:26 2010 +0200 +++ b/src/Pure/Isar/theory_target.ML Tue Aug 10 14:06:38 2010 +0200 @@ -5,163 +5,6 @@ Common theory/locale/class/instantiation/overloading targets. *) -signature GENERIC_TARGET = -sig - val notes: (string - -> (Attrib.binding * (thm list * Args.src list) list) list - -> (Attrib.binding * (thm list * Args.src list) list) list - -> local_theory -> local_theory) - -> string -> (Attrib.binding * (thm list * Args.src list) list) list - -> local_theory -> (string * thm list) list * local_theory - val define: (((binding * typ) * mixfix) * term -> binding -> term list - -> (string * sort) list * term list -> local_theory -> (term * thm) * local_theory) - -> (binding * mixfix) * (Attrib.binding * term) -> local_theory - -> (term * (string * thm)) * local_theory - val abbrev: (string * bool -> binding * mixfix -> term * term -> (string * sort) list * term list - -> local_theory -> local_theory) - -> string * bool -> (binding * mixfix) * term -> local_theory -> (term * term) * local_theory -end; - -structure Generic_Target: GENERIC_TARGET = -struct - -(* notes *) - -fun import_export_proof ctxt (name, raw_th) = - let - val thy = ProofContext.theory_of ctxt; - val thy_ctxt = ProofContext.init_global thy; - val certT = Thm.ctyp_of thy; - val cert = Thm.cterm_of thy; - - (*export assumes/defines*) - val th = Goal.norm_result raw_th; - val (defs, th') = Local_Defs.export ctxt thy_ctxt th; - val assms = map (MetaSimplifier.rewrite_rule defs o Thm.assume) (Assumption.all_assms_of ctxt); - val nprems = Thm.nprems_of th' - Thm.nprems_of th; - - (*export fixes*) - val tfrees = map TFree (Thm.fold_terms Term.add_tfrees th' []); - val frees = map Free (Thm.fold_terms Term.add_frees th' []); - val (th'' :: vs) = (th' :: map (Drule.mk_term o cert) (map Logic.mk_type tfrees @ frees)) - |> Variable.export ctxt thy_ctxt - |> Drule.zero_var_indexes_list; - - (*thm definition*) - val result = PureThy.name_thm true true name th''; - - (*import fixes*) - val (tvars, vars) = - chop (length tfrees) (map (Thm.term_of o Drule.dest_term) vs) - |>> map Logic.dest_type; - - val instT = map_filter (fn (TVar v, T) => SOME (v, T) | _ => NONE) (tvars ~~ tfrees); - val inst = filter (is_Var o fst) (vars ~~ frees); - val cinstT = map (pairself certT o apfst TVar) instT; - val cinst = map (pairself (cert o Term.map_types (Term_Subst.instantiateT instT))) inst; - val result' = Thm.instantiate (cinstT, cinst) result; - - (*import assumes/defines*) - val assm_tac = FIRST' (map (fn assm => Tactic.compose_tac (false, assm, 0)) assms); - val result'' = - (case SINGLE (Seq.INTERVAL assm_tac 1 nprems) result' of - NONE => raise THM ("Failed to re-import result", 0, [result']) - | SOME res => Local_Defs.contract ctxt defs (Thm.cprop_of th) res) - |> Goal.norm_result - |> PureThy.name_thm false false name; - - in (result'', result) end; - -fun notes target_notes kind facts lthy = - let - val thy = ProofContext.theory_of lthy; - val facts' = facts - |> map (fn (a, bs) => (a, PureThy.burrow_fact (PureThy.name_multi - (Local_Theory.full_name lthy (fst a))) bs)) - |> PureThy.map_facts (import_export_proof lthy); - val local_facts = PureThy.map_facts #1 facts'; - val global_facts = PureThy.map_facts #2 facts'; - in - lthy - |> target_notes kind global_facts local_facts - |> ProofContext.note_thmss kind (Attrib.map_facts (Attrib.attribute_i thy) local_facts) - end; - - -(* define *) - -fun define foundation ((b, mx), ((name, atts), rhs)) lthy = - let - val thy = ProofContext.theory_of lthy; - val thy_ctxt = ProofContext.init_global thy; - - val name' = Thm.def_binding_optional b name; - - (*term and type parameters*) - val crhs = Thm.cterm_of thy rhs; - val (defs, rhs') = Local_Defs.export_cterm lthy thy_ctxt crhs ||> Thm.term_of; - val rhs_conv = MetaSimplifier.rewrite true defs crhs; - - val xs = Variable.add_fixed (Local_Theory.target_of lthy) rhs' []; - val T = Term.fastype_of rhs; - val tfreesT = Term.add_tfreesT T (fold (Term.add_tfreesT o #2) xs []); - val extra_tfrees = rev (subtract (op =) tfreesT (Term.add_tfrees rhs [])); - - val type_params = map (Logic.mk_type o TFree) extra_tfrees; - val term_params = - rev (Variable.fixes_of (Local_Theory.target_of lthy)) - |> map_filter (fn (_, x) => - (case AList.lookup (op =) xs x of - SOME T => SOME (Free (x, T)) - | NONE => NONE)); - val params = type_params @ term_params; - - val U = map Term.fastype_of params ---> T; - - (*foundation*) - val ((lhs', global_def), lthy3) = foundation - (((b, U), mx), rhs') name' params (extra_tfrees, type_params) lthy; - - (*local definition*) - val ((lhs, local_def), lthy4) = lthy3 - |> Local_Defs.add_def ((b, NoSyn), lhs'); - val def = Local_Defs.trans_terms lthy4 - [(*c == global.c xs*) local_def, - (*global.c xs == rhs'*) global_def, - (*rhs' == rhs*) Thm.symmetric rhs_conv]; - - (*note*) - val ([(res_name, [res])], lthy5) = lthy4 - |> Local_Theory.notes_kind "" [((name', atts), [([def], [])])]; - in ((lhs, (res_name, res)), lthy5) end; - - -(* abbrev *) - -fun abbrev target_abbrev prmode ((b, mx), t) lthy = - let - val thy_ctxt = ProofContext.init_global (ProofContext.theory_of lthy); - val target_ctxt = Local_Theory.target_of lthy; - - val t' = Assumption.export_term lthy target_ctxt t; - val xs = map Free (rev (Variable.add_fixed target_ctxt t' [])); - val u = fold_rev lambda xs t'; - - val extra_tfrees = - subtract (op =) (Term.add_tfreesT (Term.fastype_of u) []) (Term.add_tfrees u []); - - val global_rhs = - singleton (Variable.export_terms (Variable.declare_term u target_ctxt) thy_ctxt) u; - in - lthy - |> target_abbrev prmode (b, mx) (global_rhs, t') (extra_tfrees, xs) - |> ProofContext.add_abbrev Print_Mode.internal (b, t) |> snd - |> Local_Defs.fixed_abbrev ((b, NoSyn), t) - end; - -end; - - signature THEORY_TARGET = sig val peek: local_theory -> diff -r a062fdf777df -r 0028571ade2d src/Pure/ROOT.ML --- a/src/Pure/ROOT.ML Tue Aug 10 13:58:26 2010 +0200 +++ b/src/Pure/ROOT.ML Tue Aug 10 14:06:38 2010 +0200 @@ -204,6 +204,7 @@ (*local theories and targets*) use "Isar/local_theory.ML"; +use "Isar/generic_target.ML"; use "Isar/overloading.ML"; use "Isar/locale.ML"; use "axclass.ML";