src/HOL/Tools/function_package/mutual.ML
author wenzelm
Tue, 15 Apr 2008 16:12:05 +0200
changeset 26653 60e0cf6bef89
parent 26529 03ad378ed5f0
child 28083 103d9282a946
permissions -rw-r--r--
Thm.forall_elim_var(s);
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
     1
(*  Title:      HOL/Tools/function_package/mutual.ML
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
     2
    ID:         $Id$
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
     3
    Author:     Alexander Krauss, TU Muenchen
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
     4
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
     5
A package for general recursive function definitions.
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
     6
Tools for mutual recursive definitions.
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
     7
*)
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
     8
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
     9
signature FUNDEF_MUTUAL =
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    10
sig
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    11
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    12
  val prepare_fundef_mutual : FundefCommon.fundef_config
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    13
                              -> string (* defname *)
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    14
                              -> ((string * typ) * mixfix) list
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    15
                              -> term list
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    16
                              -> local_theory
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    17
                              -> ((thm (* goalstate *)
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    18
                                   * (thm -> FundefCommon.fundef_result) (* proof continuation *)
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    19
                                  ) * local_theory)
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    20
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    21
end
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    22
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    23
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    24
structure FundefMutual: FUNDEF_MUTUAL =
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    25
struct
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    26
21051
c49467a9c1e1 Switched function package to use the new package for inductive predicates.
krauss
parents: 20949
diff changeset
    27
open FundefLib
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    28
open FundefCommon
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    29
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
    30
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
    31
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    32
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    33
type qgar = string * (string * typ) list * term list * term list * term
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    34
23217
8eac3bda1063 name_of_fqgar: precise type;
wenzelm
parents: 23203
diff changeset
    35
fun name_of_fqgar ((f, _, _, _, _): qgar) = f
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    36
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    37
datatype mutual_part =
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    38
  MutualPart of 
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    39
   {
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
    40
    i : int,
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
    41
    i' : int,
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    42
    fvar : string * typ,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    43
    cargTs: typ list,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    44
    f_def: term,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    45
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    46
    f: term option,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    47
    f_defthm : thm option
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    48
   }
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    49
   
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    50
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    51
datatype mutual_info =
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    52
  Mutual of 
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    53
   { 
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
    54
    n : int,
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
    55
    n' : int,
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    56
    fsum_var : string * typ,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    57
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    58
    ST: typ,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    59
    RST: typ,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    60
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    61
    parts: mutual_part list,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    62
    fqgars: qgar list,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    63
    qglrs: ((string * typ) list * term list * term * term) list,
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    64
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    65
    fsum : term option
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    66
   }
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    67
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    68
fun mutual_induct_Pnames n =
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    69
    if n < 5 then fst (chop n ["P","Q","R","S"])
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    70
    else map (fn i => "P" ^ string_of_int i) (1 upto n)
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    71
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    72
fun get_part fname =
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    73
    the o find_first (fn (MutualPart {fvar=(n,_), ...}) => n = fname)
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
    74
                     
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    75
(* FIXME *)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    76
fun mk_prod_abs e (t1, t2) =
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    77
    let
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    78
      val bTs = rev (map snd e)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    79
      val T1 = fastype_of1 (bTs, t1)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    80
      val T2 = fastype_of1 (bTs, t2)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    81
    in
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    82
      HOLogic.pair_const T1 T2 $ t1 $ t2
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    83
    end;
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    84
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
    85
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
    86
fun analyze_eqs ctxt defname fs eqs =
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    87
    let
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
    88
      val num = length fs
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    89
        val fnames = map fst fs
24170
33f055a0f3a1 more error handling
krauss
parents: 23819
diff changeset
    90
        val fqgars = map (split_def ctxt) eqs
23189
4574ab8f3b21 simplified interfaces, some restructuring
krauss
parents: 22733
diff changeset
    91
        val arities = mk_arities fqgars
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
    92
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    93
        fun curried_types (fname, fT) =
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    94
            let
20654
d80502f0d701 1. Function package accepts a parameter (default "some_term"), which specifies the functions
krauss
parents: 20534
diff changeset
    95
              val k = the_default 1 (Symtab.lookup arities fname)
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    96
              val (caTs, uaTs) = chop k (binder_types fT)
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    97
            in
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    98
                (caTs, uaTs ---> body_type fT)
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
    99
            end
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   100
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   101
        val (caTss, resultTs) = split_list (map curried_types fs)
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   102
        val argTs = map (foldr1 HOLogic.mk_prodT) caTss
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   103
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   104
        val dresultTs = distinct (Type.eq_type Vartab.empty) resultTs
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   105
        val n' = length dresultTs
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   106
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   107
        val RST = BalancedTree.make (uncurry SumTree.mk_sumT) dresultTs
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   108
        val ST = BalancedTree.make (uncurry SumTree.mk_sumT) argTs
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   109
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   110
        val fsum_type = ST --> RST
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   111
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   112
        val ([fsum_var_name], _) = Variable.add_fixes [ defname ^ "_sum" ] ctxt
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   113
        val fsum_var = (fsum_var_name, fsum_type)
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   114
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   115
        fun define (fvar as (n, T)) caTs resultT i =
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   116
            let
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   117
                val vars = map_index (fn (j,T) => Free ("x" ^ string_of_int j, T)) caTs (* FIXME: Bind xs properly *)
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   118
                val i' = find_index (fn Ta => Type.eq_type Vartab.empty (Ta, resultT)) dresultTs + 1 
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   119
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   120
                val f_exp = SumTree.mk_proj RST n' i' (Free fsum_var $ SumTree.mk_inj ST num i (foldr1 HOLogic.mk_prod vars))
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   121
                val def = Term.abstract_over (Free fsum_var, fold_rev lambda vars f_exp)
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   122
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   123
                val rew = (n, fold_rev lambda vars f_exp)
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   124
            in
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   125
                (MutualPart {i=i, i'=i', fvar=fvar,cargTs=caTs,f_def=def,f=NONE,f_defthm=NONE}, rew)
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   126
            end
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   127
            
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   128
        val (parts, rews) = split_list (map4 define fs caTss resultTs (1 upto num))
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   129
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   130
        fun convert_eqs (f, qs, gs, args, rhs) =
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   131
            let
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   132
              val MutualPart {i, i', ...} = get_part f parts
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   133
            in
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   134
              (qs, gs, SumTree.mk_inj ST num i (foldr1 (mk_prod_abs qs) args),
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   135
               SumTree.mk_inj RST n' i' (replace_frees rews rhs)
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   136
                               |> Envir.beta_norm)
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   137
            end
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   138
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   139
        val qglrs = map convert_eqs fqgars
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   140
    in
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   141
        Mutual {n=num, n'=n', fsum_var=fsum_var, ST=ST, RST=RST, 
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   142
                parts=parts, fqgars=fqgars, qglrs=qglrs, fsum=NONE}
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   143
    end
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   144
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   145
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   146
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   147
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   148
fun define_projections fixes mutual fsum lthy =
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   149
    let
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   150
      fun def ((MutualPart {i=i, i'=i', fvar=(fname, fT), cargTs, f_def, ...}), (_, mixfix)) lthy =
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   151
          let
21436
5313a4cc3823 LocalTheory.notes/defs: proper kind;
wenzelm
parents: 21319
diff changeset
   152
            val ((f, (_, f_defthm)), lthy') =
25016
2bcac52d7abc renamed LocalTheory.def to LocalTheory.define;
wenzelm
parents: 24977
diff changeset
   153
              LocalTheory.define Thm.internalK ((fname, mixfix),
21436
5313a4cc3823 LocalTheory.notes/defs: proper kind;
wenzelm
parents: 21319
diff changeset
   154
                                            ((fname ^ "_def", []), Term.subst_bound (fsum, f_def)))
5313a4cc3823 LocalTheory.notes/defs: proper kind;
wenzelm
parents: 21319
diff changeset
   155
                              lthy
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   156
          in
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   157
            (MutualPart {i=i, i'=i', fvar=(fname, fT), cargTs=cargTs, f_def=f_def,
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   158
                         f=SOME f, f_defthm=SOME f_defthm },
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   159
             lthy')
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   160
          end
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   161
          
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   162
      val Mutual { n, n', fsum_var, ST, RST, parts, fqgars, qglrs, ... } = mutual
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   163
      val (parts', lthy') = fold_map def (parts ~~ fixes) lthy
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   164
    in
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   165
      (Mutual { n=n, n'=n', fsum_var=fsum_var, ST=ST, RST=RST, parts=parts',
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   166
                fqgars=fqgars, qglrs=qglrs, fsum=SOME fsum },
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   167
       lthy')
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   168
    end
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   169
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   170
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   171
fun in_context ctxt (f, pre_qs, pre_gs, pre_args, pre_rhs) F =
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   172
    let
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   173
      val thy = ProofContext.theory_of ctxt
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   174
                
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   175
      val oqnames = map fst pre_qs
20797
c1f0bc7e7d80 renamed Variable.invent_fixes to Variable.variant_fixes;
wenzelm
parents: 20654
diff changeset
   176
      val (qs, ctxt') = Variable.variant_fixes oqnames ctxt
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   177
                        |>> map2 (fn (_, T) => fn n => Free (n, T)) pre_qs
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   178
                        
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   179
      fun inst t = subst_bounds (rev qs, t)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   180
      val gs = map inst pre_gs
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   181
      val args = map inst pre_args
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   182
      val rhs = inst pre_rhs
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   183
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   184
      val cqs = map (cterm_of thy) qs
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   185
      val ags = map (assume o cterm_of thy) gs
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   186
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   187
      val import = fold forall_elim cqs
24977
9f98751c9628 replaced (flip Thm.implies_elim) by Thm.elim_implies;
wenzelm
parents: 24171
diff changeset
   188
                   #> fold Thm.elim_implies ags
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   189
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   190
      val export = fold_rev (implies_intr o cprop_of) ags
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   191
                   #> fold_rev forall_intr_rename (oqnames ~~ cqs)
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   192
    in
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   193
      F ctxt (f, qs, gs, args, rhs) import export
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   194
    end
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   195
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   196
fun recover_mutual_psimp all_orig_fdefs parts ctxt (fname, _, _, args, rhs) import (export : thm -> thm) sum_psimp_eq =
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   197
    let
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   198
      val (MutualPart {f=SOME f, f_defthm=SOME f_def, ...}) = get_part fname parts
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   199
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   200
      val psimp = import sum_psimp_eq
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   201
      val (simp, restore_cond) = case cprems_of psimp of
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   202
                                   [] => (psimp, I)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   203
                                 | [cond] => (implies_elim psimp (assume cond), implies_intr cond)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   204
                                 | _ => sys_error "Too many conditions"
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   205
    in
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   206
      Goal.prove ctxt [] [] 
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   207
                 (HOLogic.Trueprop $ HOLogic.mk_eq (list_comb (f, args), rhs))
24171
25381ce95316 Issue a warning, when "function" encounters variables occuring in function position,
krauss
parents: 24170
diff changeset
   208
                 (fn _ => (LocalDefs.unfold_tac ctxt all_orig_fdefs)
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   209
                          THEN EqSubst.eqsubst_tac ctxt [0] [simp] 1
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   210
                          THEN SIMPSET' (fn ss => simp_tac (ss addsimps SumTree.proj_in_rules)) 1)
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   211
        |> restore_cond 
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   212
        |> export
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   213
    end
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   214
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   215
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   216
(* FIXME HACK *)
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   217
fun mk_applied_form ctxt caTs thm =
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   218
    let
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   219
      val thy = ProofContext.theory_of ctxt
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   220
      val xs = map_index (fn (i,T) => cterm_of thy (Free ("x" ^ string_of_int i, T))) caTs (* FIXME: Bind xs properly *)
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   221
    in
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   222
      fold (fn x => fn thm => combination thm (reflexive x)) xs thm
26196
0a0c2752561e Use conversions instead of simplifier. tuned
krauss
parents: 25555
diff changeset
   223
           |> Conv.fconv_rule (Thm.beta_conversion true)
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   224
           |> fold_rev forall_intr xs
26653
60e0cf6bef89 Thm.forall_elim_var(s);
wenzelm
parents: 26529
diff changeset
   225
           |> Thm.forall_elim_vars 0
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   226
    end
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   227
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   228
23494
f985f9239e0d removed "sum_tools.ML" in favour of BalancedTree
krauss
parents: 23217
diff changeset
   229
fun mutual_induct_rules lthy induct all_f_defs (Mutual {n, ST, RST, parts, ...}) =
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   230
    let
22623
5fcee5b319a2 proper handling of morphisms
krauss
parents: 22622
diff changeset
   231
      val cert = cterm_of (ProofContext.theory_of lthy)
20949
f030835fd9e4 Induction rules have schematic variables again.
krauss
parents: 20878
diff changeset
   232
      val newPs = map2 (fn Pname => fn MutualPart {cargTs, ...} => 
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   233
                                       Free (Pname, cargTs ---> HOLogic.boolT))
20949
f030835fd9e4 Induction rules have schematic variables again.
krauss
parents: 20878
diff changeset
   234
                       (mutual_induct_Pnames (length parts))
f030835fd9e4 Induction rules have schematic variables again.
krauss
parents: 20878
diff changeset
   235
                       parts
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   236
                       
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   237
      fun mk_P (MutualPart {cargTs, ...}) P =
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   238
          let
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   239
            val avars = map_index (fn (i,T) => Var (("a", i), T)) cargTs
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   240
            val atup = foldr1 HOLogic.mk_prod avars
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   241
          in
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   242
            tupled_lambda atup (list_comb (P, avars))
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   243
          end
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   244
          
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   245
      val Ps = map2 mk_P parts newPs
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   246
      val case_exp = SumTree.mk_sumcases HOLogic.boolT Ps
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   247
                     
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   248
      val induct_inst =
22623
5fcee5b319a2 proper handling of morphisms
krauss
parents: 22622
diff changeset
   249
          forall_elim (cert case_exp) induct
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   250
                      |> full_simplify SumTree.sumcase_split_ss
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   251
                      |> full_simplify (HOL_basic_ss addsimps all_f_defs)
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   252
          
25046
3d0137a59dcb Fixed variable naming in mutual induction rules
krauss
parents: 25016
diff changeset
   253
      fun project rule (MutualPart {cargTs, i, ...}) k =
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   254
          let
25046
3d0137a59dcb Fixed variable naming in mutual induction rules
krauss
parents: 25016
diff changeset
   255
            val afs = map_index (fn (j,T) => Free ("a" ^ string_of_int (j + k), T)) cargTs (* FIXME! *)
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   256
            val inj = SumTree.mk_inj ST n i (foldr1 HOLogic.mk_prod afs)
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   257
          in
25046
3d0137a59dcb Fixed variable naming in mutual induction rules
krauss
parents: 25016
diff changeset
   258
            (rule
22623
5fcee5b319a2 proper handling of morphisms
krauss
parents: 22622
diff changeset
   259
              |> forall_elim (cert inj)
25555
224a40e39457 factored out handling of sum types again
krauss
parents: 25046
diff changeset
   260
              |> full_simplify SumTree.sumcase_split_ss
25046
3d0137a59dcb Fixed variable naming in mutual induction rules
krauss
parents: 25016
diff changeset
   261
              |> fold_rev (forall_intr o cert) (afs @ newPs),
3d0137a59dcb Fixed variable naming in mutual induction rules
krauss
parents: 25016
diff changeset
   262
             k + length cargTs)
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   263
          end
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   264
    in
25046
3d0137a59dcb Fixed variable naming in mutual induction rules
krauss
parents: 25016
diff changeset
   265
      fst (fold_map (project induct_inst) parts 0)
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   266
    end
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   267
    
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   268
22623
5fcee5b319a2 proper handling of morphisms
krauss
parents: 22622
diff changeset
   269
fun mk_partial_rules_mutual lthy inner_cont (m as Mutual {parts, fqgars, ...}) proof =
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   270
    let
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   271
      val result = inner_cont proof
26529
03ad378ed5f0 Function package no longer overwrites theorems.
krauss
parents: 26196
diff changeset
   272
      val FundefResult {fs=[f], G, R, cases, psimps, trsimps, simple_pinducts=[simple_pinduct],
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   273
                        termination,domintros} = result
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   274
                                                                                                               
22733
0b14bb35be90 definition lookup via terms, not names. Methods "relation" and "lexicographic_order"
krauss
parents: 22623
diff changeset
   275
      val (all_f_defs, fs) = map (fn MutualPart {f_defthm = SOME f_def, f = SOME f, cargTs, ...} =>
0b14bb35be90 definition lookup via terms, not names. Methods "relation" and "lexicographic_order"
krauss
parents: 22623
diff changeset
   276
                                     (mk_applied_form lthy cargTs (symmetric f_def), f))
0b14bb35be90 definition lookup via terms, not names. Methods "relation" and "lexicographic_order"
krauss
parents: 22623
diff changeset
   277
                                 parts
0b14bb35be90 definition lookup via terms, not names. Methods "relation" and "lexicographic_order"
krauss
parents: 22623
diff changeset
   278
                             |> split_list
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   279
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   280
      val all_orig_fdefs = map (fn MutualPart {f_defthm = SOME f_def, ...} => f_def) parts
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   281
                           
20878
384c5bb713b2 mk_partial_rules_mutual: expand result terms/thms;
wenzelm
parents: 20851
diff changeset
   282
      fun mk_mpsimp fqgar sum_psimp =
22497
1fe951654cee fixed problem with the construction of mutual simp rules
krauss
parents: 22323
diff changeset
   283
          in_context lthy fqgar (recover_mutual_psimp all_orig_fdefs parts) sum_psimp
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   284
          
23189
4574ab8f3b21 simplified interfaces, some restructuring
krauss
parents: 22733
diff changeset
   285
      val rew_ss = HOL_basic_ss addsimps all_f_defs
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   286
      val mpsimps = map2 mk_mpsimp fqgars psimps
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   287
      val mtrsimps = map_option (map2 mk_mpsimp fqgars) trsimps
22623
5fcee5b319a2 proper handling of morphisms
krauss
parents: 22622
diff changeset
   288
      val minducts = mutual_induct_rules lthy simple_pinduct all_f_defs m
23189
4574ab8f3b21 simplified interfaces, some restructuring
krauss
parents: 22733
diff changeset
   289
      val mtermination = full_simplify rew_ss termination
4574ab8f3b21 simplified interfaces, some restructuring
krauss
parents: 22733
diff changeset
   290
      val mdomintros = map_option (map (full_simplify rew_ss)) domintros
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   291
    in
22733
0b14bb35be90 definition lookup via terms, not names. Methods "relation" and "lexicographic_order"
krauss
parents: 22623
diff changeset
   292
      FundefResult { fs=fs, G=G, R=R,
26529
03ad378ed5f0 Function package no longer overwrites theorems.
krauss
parents: 26196
diff changeset
   293
                     psimps=mpsimps, simple_pinducts=minducts,
22623
5fcee5b319a2 proper handling of morphisms
krauss
parents: 22622
diff changeset
   294
                     cases=cases, termination=mtermination,
23189
4574ab8f3b21 simplified interfaces, some restructuring
krauss
parents: 22733
diff changeset
   295
                     domintros=mdomintros,
22623
5fcee5b319a2 proper handling of morphisms
krauss
parents: 22622
diff changeset
   296
                     trsimps=mtrsimps}
20523
36a59e5d0039 Major update to function package, including new syntax and the (only theoretical)
krauss
parents: 19922
diff changeset
   297
    end
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   298
      
23189
4574ab8f3b21 simplified interfaces, some restructuring
krauss
parents: 22733
diff changeset
   299
fun prepare_fundef_mutual config defname fixes eqss lthy =
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   300
    let
22323
b8c227d8ca91 beta_eta_contract specification befor processing. These normal forms avoid unpleasant surprises later on.
krauss
parents: 22244
diff changeset
   301
      val mutual = analyze_eqs lthy defname (map fst fixes) (map Envir.beta_eta_contract eqss)
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   302
      val Mutual {fsum_var=(n, T), qglrs, ...} = mutual
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   303
          
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   304
      val ((fsum, goalstate, cont), lthy') =
23189
4574ab8f3b21 simplified interfaces, some restructuring
krauss
parents: 22733
diff changeset
   305
          FundefCore.prepare_fundef config defname [((n, T), NoSyn)] qglrs lthy
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   306
          
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   307
      val (mutual', lthy'') = define_projections fixes mutual fsum lthy'
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   308
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   309
      val mutual_cont = mk_partial_rules_mutual lthy'' cont mutual'
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   310
    in
23819
2040846d1bbe some interface cleanup
krauss
parents: 23528
diff changeset
   311
      ((goalstate, mutual_cont), lthy'')
22166
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   312
    end
0a50d4db234a * Preliminary implementation of tail recursion
krauss
parents: 21436
diff changeset
   313
21237
b803f9870e97 untabified
krauss
parents: 21051
diff changeset
   314
    
19770
be5c23ebe1eb HOL/Tools/function_package: Added support for mutual recursive definitions.
krauss
parents:
diff changeset
   315
end