# HG changeset patch # User haftmann # Date 1281444150 -7200 # Node ID 9d4c0c74ae7d511544ca9ded7a3428fa61d69e65 # Parent 9bd4e568c58c78365d50f70bdf0e2711d45e121e whitespace tuning diff -r 9bd4e568c58c -r 9d4c0c74ae7d src/Pure/Isar/generic_target.ML --- a/src/Pure/Isar/generic_target.ML Tue Aug 10 14:15:44 2010 +0200 +++ b/src/Pure/Isar/generic_target.ML Tue Aug 10 14:42:30 2010 +0200 @@ -17,9 +17,10 @@ -> local_theory -> local_theory) -> string -> (Attrib.binding * (thm list * Args.src list) list) list -> local_theory -> (string * thm list) list * 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 + 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 = @@ -85,7 +86,8 @@ (*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 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*) diff -r 9bd4e568c58c -r 9d4c0c74ae7d src/Pure/Isar/theory_target.ML --- a/src/Pure/Isar/theory_target.ML Tue Aug 10 14:15:44 2010 +0200 +++ b/src/Pure/Isar/theory_target.ML Tue Aug 10 14:42:30 2010 +0200 @@ -94,7 +94,8 @@ (ProofContext.add_abbrev Print_Mode.internal arg) #-> (fn (lhs' as Const (d, _), _) => same_shape ? - (Context.mapping (Sign.revert_abbrev mode d) (ProofContext.revert_abbrev mode d) #> + (Context.mapping + (Sign.revert_abbrev mode d) (ProofContext.revert_abbrev mode d) #> Morphism.form (ProofContext.target_notation true prmode [(lhs', mx)])))) end; @@ -169,7 +170,8 @@ then AxClass.define_overloaded name' (head, rhs') else Thm.add_def false false (name', Logic.mk_equals (lhs', rhs')) #>> snd) ||> is_locale ? locale_const_declaration ta Syntax.mode_default ((b, mx2), lhs') - ||> is_class ? class_target ta (Class_Target.declare target ((b, mx1), (type_params, lhs'))) + ||> is_class ? class_target ta + (Class_Target.declare target ((b, mx1), (type_params, lhs'))) end; in @@ -194,7 +196,8 @@ fun locale_notes locale kind global_facts local_facts lthy = let val global_facts' = Attrib.map_facts (K I) global_facts; - val local_facts' = Element.facts_map (Element.morph_ctxt (Local_Theory.target_morphism lthy)) local_facts; + val local_facts' = Element.facts_map + (Element.morph_ctxt (Local_Theory.target_morphism lthy)) local_facts; in lthy |> Local_Theory.theory (PureThy.note_thmss kind global_facts' #> snd) @@ -209,11 +212,13 @@ (* abbrev *) fun theory_abbrev prmode ((b, mx), t) = Local_Theory.theory - (Sign.add_abbrev (#1 prmode) (b, t) #-> (fn (lhs, _) => Sign.notation true prmode [(lhs, mx)])); + (Sign.add_abbrev (#1 prmode) (b, t) #-> + (fn (lhs, _) => Sign.notation true prmode [(lhs, mx)])); fun locale_abbrev ta prmode ((b, mx), t) xs = Local_Theory.theory_result - (Sign.add_abbrev Print_Mode.internal (b, t)) #-> (fn (lhs, _) => - locale_const_declaration ta prmode ((b, mx), Term.list_comb (Logic.unvarify_global lhs, xs))); + (Sign.add_abbrev Print_Mode.internal (b, t)) #-> + (fn (lhs, _) => locale_const_declaration ta prmode + ((b, mx), Term.list_comb (Logic.unvarify_global lhs, xs))); fun target_abbrev (ta as Target {target, is_locale, is_class, ...}) prmode (b, mx) (global_rhs, t') (extra_tfrees, xs) lthy = @@ -238,10 +243,10 @@ val target_name = [Pretty.command (if is_class then "class" else "locale"), Pretty.str (" " ^ Locale.extern thy target)]; - val fixes = - map (fn (x, T) => (Binding.name x, SOME T, NoSyn)) (#1 (ProofContext.inferred_fixes ctxt)); - val assumes = - map (fn A => (Attrib.empty_binding, [(Thm.term_of A, [])])) (Assumption.all_assms_of ctxt); + val fixes = map (fn (x, T) => (Binding.name x, SOME T, NoSyn)) + (#1 (ProofContext.inferred_fixes ctxt)); + val assumes = map (fn A => (Attrib.empty_binding, [(Thm.term_of A, [])])) + (Assumption.all_assms_of ctxt); val elems = (if null fixes then [] else [Element.Fixes fixes]) @ (if null assumes then [] else [Element.Assumes assumes]); @@ -279,8 +284,10 @@ {define = define ta, notes = notes ta, abbrev = abbrev ta, - declaration = fn pervasive => target_declaration ta { syntax = false, pervasive = pervasive }, - syntax_declaration = fn pervasive => target_declaration ta { syntax = true, pervasive = pervasive }, + declaration = fn pervasive => target_declaration ta + { syntax = false, pervasive = pervasive }, + syntax_declaration = fn pervasive => target_declaration ta + { syntax = true, pervasive = pervasive }, pretty = pretty ta, reinit = init_target ta o ProofContext.theory_of, exit = Local_Theory.target_of o @@ -309,7 +316,8 @@ | context_cmd target thy = init (SOME (Locale.intern thy target)) thy; fun instantiation arities = init_target (make_target "" false false arities []); -fun instantiation_cmd arities thy = instantiation (Class_Target.read_multi_arity thy arities) thy; +fun instantiation_cmd arities thy = + instantiation (Class_Target.read_multi_arity thy arities) thy; val overloading = gen_overloading (fn ctxt => Syntax.check_term ctxt o Const); val overloading_cmd = gen_overloading Syntax.read_term;