src/HOL/hologic.ML
author haftmann
Wed, 06 Sep 2006 13:48:02 +0200
changeset 20485 3078fd2eec7b
parent 19481 a6205c6203ea
child 20713 823967ef47f1
permissions -rw-r--r--
got rid of Numeral.bin type
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     1
(*  Title:      HOL/hologic.ML
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     2
    ID:         $Id$
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     3
    Author:     Lawrence C Paulson and Markus Wenzel
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     4
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     5
Abstract syntax operations for HOL.
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     6
*)
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     7
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     8
signature HOLOGIC =
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
     9
sig
12338
de0f4a63baa5 renamed class "term" to "type" (actually "HOL.type");
wenzelm
parents: 11818
diff changeset
    10
  val typeS: sort
de0f4a63baa5 renamed class "term" to "type" (actually "HOL.type");
wenzelm
parents: 11818
diff changeset
    11
  val typeT: typ
8275
32387a2c7749 added boolN;
wenzelm
parents: 8100
diff changeset
    12
  val boolN: string
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    13
  val boolT: typ
7073
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
    14
  val false_const: term
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
    15
  val true_const: term
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    16
  val mk_setT: typ -> typ
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    17
  val dest_setT: typ -> typ
15965
f422f8283491 Use of IntInf.int instead of int in most numeric simprocs; avoids
paulson
parents: 15945
diff changeset
    18
  val Trueprop: term
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    19
  val mk_Trueprop: term -> term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    20
  val dest_Trueprop: term -> term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    21
  val conj: term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    22
  val disj: term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    23
  val imp: term
8429
515fa7533354 added Not;
wenzelm
parents: 8302
diff changeset
    24
  val Not: term
7690
27676b51243d added mk_conj, mk_disj, mk_imp;
wenzelm
parents: 7548
diff changeset
    25
  val mk_conj: term * term -> term
27676b51243d added mk_conj, mk_disj, mk_imp;
wenzelm
parents: 7548
diff changeset
    26
  val mk_disj: term * term -> term
27676b51243d added mk_conj, mk_disj, mk_imp;
wenzelm
parents: 7548
diff changeset
    27
  val mk_imp: term * term -> term
16835
2e7d7ec7a268 removed not_const -- use Not instead;
wenzelm
parents: 15965
diff changeset
    28
  val mk_not: term -> term
15151
429666b09783 proof reconstruction for external ATPs
paulson
parents: 15062
diff changeset
    29
  val dest_conj: term -> term list
15945
08e8d3fb9343 choice_const moved to hologic.ML
paulson
parents: 15620
diff changeset
    30
  val dest_disj: term -> term list
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    31
  val dest_imp: term -> term * term
15151
429666b09783 proof reconstruction for external ATPs
paulson
parents: 15062
diff changeset
    32
  val dest_not: term -> term
11683
f2268239b93f added dest_concls;
wenzelm
parents: 11604
diff changeset
    33
  val dest_concls: term -> term list
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    34
  val eq_const: typ -> term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    35
  val all_const: typ -> term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    36
  val exists_const: typ -> term
15945
08e8d3fb9343 choice_const moved to hologic.ML
paulson
parents: 15620
diff changeset
    37
  val choice_const: typ -> term
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    38
  val Collect_const: typ -> term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    39
  val mk_eq: term * term -> term
6031
d9fa148383e2 new function dest_eq
paulson
parents: 5207
diff changeset
    40
  val dest_eq: term -> term * term
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    41
  val mk_all: string * typ * term -> term
13640
993576f4de30 Added list_all.
berghofe
parents: 12338
diff changeset
    42
  val list_all: (string * typ) list * term -> term
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    43
  val mk_exists: string * typ * term -> term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    44
  val mk_Collect: string * typ * term -> term
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    45
  val mk_mem: term * term -> term
6380
32fda1090a13 added dest_mem;
wenzelm
parents: 6031
diff changeset
    46
  val dest_mem: term -> term * term
11818
9eab353e810b added mk_UNIV;
wenzelm
parents: 11683
diff changeset
    47
  val mk_UNIV: typ -> term
2510
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
    48
  val mk_binop: string -> term * term -> term
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
    49
  val mk_binrel: string -> term * term -> term
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
    50
  val dest_bin: string -> typ -> term -> term * term
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    51
  val unitT: typ
9362
b78d4246a320 added is_unitT;
wenzelm
parents: 8768
diff changeset
    52
  val is_unitT: typ -> bool
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    53
  val unit: term
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    54
  val is_unit: term -> bool
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    55
  val mk_prodT: typ * typ -> typ
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    56
  val dest_prodT: typ -> typ * typ
14048
03a9adec9869 Added pair_const.
berghofe
parents: 13755
diff changeset
    57
  val pair_const: typ -> typ -> term
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    58
  val mk_prod: term * term -> term
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    59
  val dest_prod: term -> term * term
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    60
  val mk_fst: term -> term
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
    61
  val mk_snd: term -> term
18285
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
    62
  val mk_split: term -> term
5096
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
    63
  val prodT_factors: typ -> typ list
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
    64
  val split_const: typ * typ * typ -> term
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
    65
  val mk_tuple: typ -> term list -> term
5207
wenzelm
parents: 5096
diff changeset
    66
  val natT: typ
wenzelm
parents: 5096
diff changeset
    67
  val zero: term
wenzelm
parents: 5096
diff changeset
    68
  val is_zero: term -> bool
wenzelm
parents: 5096
diff changeset
    69
  val mk_Suc: term -> term
wenzelm
parents: 5096
diff changeset
    70
  val dest_Suc: term -> term
wenzelm
parents: 5096
diff changeset
    71
  val mk_nat: int -> term
wenzelm
parents: 5096
diff changeset
    72
  val dest_nat: term -> int
7073
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
    73
  val intT: typ
15965
f422f8283491 Use of IntInf.int instead of int in most numeric simprocs; avoids
paulson
parents: 15945
diff changeset
    74
  val mk_int: IntInf.int -> term
7163
3a2f8fdf4dab added realT
paulson
parents: 7073
diff changeset
    75
  val realT: typ
15620
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
    76
  val bitT: typ
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
    77
  val B0_const: term
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
    78
  val B1_const: term
7073
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
    79
  val pls_const: term
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
    80
  val min_const: term
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
    81
  val bit_const: term
8768
9f18aba48519 number_of now takes a type arg
paulson
parents: 8739
diff changeset
    82
  val number_of_const: typ -> term
16971
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
    83
  val int_of: int list -> IntInf.int
15965
f422f8283491 Use of IntInf.int instead of int in most numeric simprocs; avoids
paulson
parents: 15945
diff changeset
    84
  val dest_binum: term -> IntInf.int
19481
a6205c6203ea renamed HOLogic.mk_bin to mk_binum for consistency with dest_binum
paulson
parents: 18285
diff changeset
    85
  val mk_binum: IntInf.int -> term
15620
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
    86
  val bin_of : term -> int list
17083
051b0897bc98 added listT
nipkow
parents: 16971
diff changeset
    87
  val listT : typ -> typ
13755
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
    88
  val mk_list: ('a -> term) -> typ -> 'a list -> term
15062
8049f217428e Added function dest_list.
berghofe
parents: 15013
diff changeset
    89
  val dest_list: term -> term list
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    90
end;
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    91
2510
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
    92
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    93
structure HOLogic: HOLOGIC =
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    94
struct
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    95
12338
de0f4a63baa5 renamed class "term" to "type" (actually "HOL.type");
wenzelm
parents: 11818
diff changeset
    96
(* HOL syntax *)
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
    97
12338
de0f4a63baa5 renamed class "term" to "type" (actually "HOL.type");
wenzelm
parents: 11818
diff changeset
    98
val typeS: sort = ["HOL.type"];
de0f4a63baa5 renamed class "term" to "type" (actually "HOL.type");
wenzelm
parents: 11818
diff changeset
    99
val typeT = TypeInfer.anyT typeS;
de0f4a63baa5 renamed class "term" to "type" (actually "HOL.type");
wenzelm
parents: 11818
diff changeset
   100
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   101
2510
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   102
(* bool and set *)
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   103
8275
32387a2c7749 added boolN;
wenzelm
parents: 8100
diff changeset
   104
val boolN = "bool";
32387a2c7749 added boolN;
wenzelm
parents: 8100
diff changeset
   105
val boolT = Type (boolN, []);
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   106
9856
c34d3c94298c added not_const;
wenzelm
parents: 9473
diff changeset
   107
val true_const =  Const ("True", boolT);
c34d3c94298c added not_const;
wenzelm
parents: 9473
diff changeset
   108
val false_const = Const ("False", boolT);
7073
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
   109
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   110
fun mk_setT T = Type ("set", [T]);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   111
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   112
fun dest_setT (Type ("set", [T])) = T
3794
d543bb9ab896 eliminated raise_term, raise_typ;
wenzelm
parents: 2510
diff changeset
   113
  | dest_setT T = raise TYPE ("dest_setT: set type expected", [T], []);
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   114
8275
32387a2c7749 added boolN;
wenzelm
parents: 8100
diff changeset
   115
7073
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
   116
(* logic *)
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   117
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   118
val Trueprop = Const ("Trueprop", boolT --> propT);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   119
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   120
fun mk_Trueprop P = Trueprop $ P;
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   121
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   122
fun dest_Trueprop (Const ("Trueprop", _) $ P) = P
3794
d543bb9ab896 eliminated raise_term, raise_typ;
wenzelm
parents: 2510
diff changeset
   123
  | dest_Trueprop t = raise TERM ("dest_Trueprop", [t]);
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   124
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   125
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   126
val conj = Const ("op &", [boolT, boolT] ---> boolT)
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   127
and disj = Const ("op |", [boolT, boolT] ---> boolT)
8429
515fa7533354 added Not;
wenzelm
parents: 8302
diff changeset
   128
and imp = Const ("op -->", [boolT, boolT] ---> boolT)
515fa7533354 added Not;
wenzelm
parents: 8302
diff changeset
   129
and Not = Const ("Not", boolT --> boolT);
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   130
7690
27676b51243d added mk_conj, mk_disj, mk_imp;
wenzelm
parents: 7548
diff changeset
   131
fun mk_conj (t1, t2) = conj $ t1 $ t2
27676b51243d added mk_conj, mk_disj, mk_imp;
wenzelm
parents: 7548
diff changeset
   132
and mk_disj (t1, t2) = disj $ t1 $ t2
16835
2e7d7ec7a268 removed not_const -- use Not instead;
wenzelm
parents: 15965
diff changeset
   133
and mk_imp (t1, t2) = imp $ t1 $ t2
2e7d7ec7a268 removed not_const -- use Not instead;
wenzelm
parents: 15965
diff changeset
   134
and mk_not t = Not $ t;
7690
27676b51243d added mk_conj, mk_disj, mk_imp;
wenzelm
parents: 7548
diff changeset
   135
15151
429666b09783 proof reconstruction for external ATPs
paulson
parents: 15062
diff changeset
   136
fun dest_conj (Const ("op &", _) $ t $ t') = t :: dest_conj t'
429666b09783 proof reconstruction for external ATPs
paulson
parents: 15062
diff changeset
   137
  | dest_conj t = [t];
429666b09783 proof reconstruction for external ATPs
paulson
parents: 15062
diff changeset
   138
15945
08e8d3fb9343 choice_const moved to hologic.ML
paulson
parents: 15620
diff changeset
   139
fun dest_disj (Const ("op |", _) $ t $ t') = t :: dest_disj t'
08e8d3fb9343 choice_const moved to hologic.ML
paulson
parents: 15620
diff changeset
   140
  | dest_disj t = [t];
08e8d3fb9343 choice_const moved to hologic.ML
paulson
parents: 15620
diff changeset
   141
4466
305390f23734 Better equality handling in Blast_tac, usingd a new variant of hyp_subst_tac
paulson
parents: 4294
diff changeset
   142
fun dest_imp (Const("op -->",_) $ A $ B) = (A, B)
305390f23734 Better equality handling in Blast_tac, usingd a new variant of hyp_subst_tac
paulson
parents: 4294
diff changeset
   143
  | dest_imp  t = raise TERM ("dest_imp", [t]);
305390f23734 Better equality handling in Blast_tac, usingd a new variant of hyp_subst_tac
paulson
parents: 4294
diff changeset
   144
15151
429666b09783 proof reconstruction for external ATPs
paulson
parents: 15062
diff changeset
   145
fun dest_not (Const ("Not", _) $ t) = t
429666b09783 proof reconstruction for external ATPs
paulson
parents: 15062
diff changeset
   146
  | dest_not t = raise TERM ("dest_not", [t]);
8302
da404f79c1fc added dest_conj;
wenzelm
parents: 8275
diff changeset
   147
11683
f2268239b93f added dest_concls;
wenzelm
parents: 11604
diff changeset
   148
fun imp_concl_of t = imp_concl_of (#2 (dest_imp t)) handle TERM _ => t;
f2268239b93f added dest_concls;
wenzelm
parents: 11604
diff changeset
   149
val dest_concls = map imp_concl_of o dest_conj o dest_Trueprop;
f2268239b93f added dest_concls;
wenzelm
parents: 11604
diff changeset
   150
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   151
fun eq_const T = Const ("op =", [T, T] ---> boolT);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   152
fun mk_eq (t, u) = eq_const (fastype_of t) $ t $ u;
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   153
6031
d9fa148383e2 new function dest_eq
paulson
parents: 5207
diff changeset
   154
fun dest_eq (Const ("op =", _) $ lhs $ rhs) = (lhs, rhs)
d9fa148383e2 new function dest_eq
paulson
parents: 5207
diff changeset
   155
  | dest_eq t = raise TERM ("dest_eq", [t])
d9fa148383e2 new function dest_eq
paulson
parents: 5207
diff changeset
   156
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   157
fun all_const T = Const ("All", [T --> boolT] ---> boolT);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   158
fun mk_all (x, T, P) = all_const T $ absfree (x, T, P);
15574
b1d1b5bfc464 Removed practically all references to Library.foldr.
skalberg
parents: 15570
diff changeset
   159
fun list_all (vs,x) = foldr (fn ((x, T), P) => all_const T $ Abs (x, T, P)) x vs;
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   160
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   161
fun exists_const T = Const ("Ex", [T --> boolT] ---> boolT);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   162
fun mk_exists (x, T, P) = exists_const T $ absfree (x, T, P);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   163
15945
08e8d3fb9343 choice_const moved to hologic.ML
paulson
parents: 15620
diff changeset
   164
fun choice_const T = Const("Hilbert_Choice.Eps", (T --> boolT) --> T)
08e8d3fb9343 choice_const moved to hologic.ML
paulson
parents: 15620
diff changeset
   165
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   166
fun Collect_const T = Const ("Collect", [T --> boolT] ---> mk_setT T);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   167
fun mk_Collect (a, T, t) = Collect_const T $ absfree (a, T, t);
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   168
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   169
fun mk_mem (x, A) =
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   170
  let val setT = fastype_of A in
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   171
    Const ("op :", [dest_setT setT, setT] ---> boolT) $ x $ A
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   172
  end;
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   173
6380
32fda1090a13 added dest_mem;
wenzelm
parents: 6031
diff changeset
   174
fun dest_mem (Const ("op :", _) $ x $ A) = (x, A)
32fda1090a13 added dest_mem;
wenzelm
parents: 6031
diff changeset
   175
  | dest_mem t = raise TERM ("dest_mem", [t]);
32fda1090a13 added dest_mem;
wenzelm
parents: 6031
diff changeset
   176
11818
9eab353e810b added mk_UNIV;
wenzelm
parents: 11683
diff changeset
   177
fun mk_UNIV T = Const ("UNIV", mk_setT T);
9eab353e810b added mk_UNIV;
wenzelm
parents: 11683
diff changeset
   178
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   179
13743
f8f9393be64c Fixed bug in simpdata.ML that prevented the use of congruence rules from a
ballarin
parents: 13640
diff changeset
   180
(* binary operations and relations *)
2510
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   181
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   182
fun mk_binop c (t, u) =
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   183
  let val T = fastype_of t in
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   184
    Const (c, [T, T] ---> T) $ t $ u
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   185
  end;
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   186
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   187
fun mk_binrel c (t, u) =
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   188
  let val T = fastype_of t in
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   189
    Const (c, [T, T] ---> boolT) $ t $ u
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   190
  end;
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   191
14387
e96d5c42c4b0 Polymorphic treatment of binary arithmetic using axclasses
paulson
parents: 14103
diff changeset
   192
(*destruct the application of a binary operator. The dummyT case is a crude
e96d5c42c4b0 Polymorphic treatment of binary arithmetic using axclasses
paulson
parents: 14103
diff changeset
   193
  way of handling polymorphic operators.*)
2510
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   194
fun dest_bin c T (tm as Const (c', Type ("fun", [T', _])) $ t $ u) =
14387
e96d5c42c4b0 Polymorphic treatment of binary arithmetic using axclasses
paulson
parents: 14103
diff changeset
   195
      if c = c' andalso (T=T' orelse T=dummyT) then (t, u)
3794
d543bb9ab896 eliminated raise_term, raise_typ;
wenzelm
parents: 2510
diff changeset
   196
      else raise TERM ("dest_bin " ^ c, [tm])
d543bb9ab896 eliminated raise_term, raise_typ;
wenzelm
parents: 2510
diff changeset
   197
  | dest_bin c _ tm = raise TERM ("dest_bin " ^ c, [tm]);
2510
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   198
e3d0ac75c723 binary oprations and relations;
wenzelm
parents: 923
diff changeset
   199
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   200
(* unit *)
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   201
11604
14b03d1463d4 made unit type local;
wenzelm
parents: 10693
diff changeset
   202
val unitT = Type ("Product_Type.unit", []);
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   203
11604
14b03d1463d4 made unit type local;
wenzelm
parents: 10693
diff changeset
   204
fun is_unitT (Type ("Product_Type.unit", [])) = true
9362
b78d4246a320 added is_unitT;
wenzelm
parents: 8768
diff changeset
   205
  | is_unitT _ = false;
b78d4246a320 added is_unitT;
wenzelm
parents: 8768
diff changeset
   206
11604
14b03d1463d4 made unit type local;
wenzelm
parents: 10693
diff changeset
   207
val unit = Const ("Product_Type.Unity", unitT);
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   208
11604
14b03d1463d4 made unit type local;
wenzelm
parents: 10693
diff changeset
   209
fun is_unit (Const ("Product_Type.Unity", _)) = true
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   210
  | is_unit _ = false;
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   211
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   212
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   213
(* prod *)
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   214
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   215
fun mk_prodT (T1, T2) = Type ("*", [T1, T2]);
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   216
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   217
fun dest_prodT (Type ("*", [T1, T2])) = (T1, T2)
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   218
  | dest_prodT T = raise TYPE ("dest_prodT", [T], []);
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   219
14048
03a9adec9869 Added pair_const.
berghofe
parents: 13755
diff changeset
   220
fun pair_const T1 T2 = Const ("Pair", [T1, T2] ---> mk_prodT (T1, T2));
03a9adec9869 Added pair_const.
berghofe
parents: 13755
diff changeset
   221
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   222
fun mk_prod (t1, t2) =
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   223
  let val T1 = fastype_of t1 and T2 = fastype_of t2 in
14048
03a9adec9869 Added pair_const.
berghofe
parents: 13755
diff changeset
   224
    pair_const T1 T2 $ t1 $ t2
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   225
  end;
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   226
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   227
fun dest_prod (Const ("Pair", _) $ t1 $ t2) = (t1, t2)
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   228
  | dest_prod t = raise TERM ("dest_prod", [t]);
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   229
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   230
fun mk_fst p =
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   231
  let val pT = fastype_of p in
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   232
    Const ("fst", pT --> fst (dest_prodT pT)) $ p
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   233
  end;
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   234
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   235
fun mk_snd p =
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   236
  let val pT = fastype_of p in
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   237
    Const ("snd", pT --> snd (dest_prodT pT)) $ p
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   238
  end;
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   239
18285
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   240
fun split_const (A, B, C) =
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   241
  Const ("split", (A --> B --> C) --> mk_prodT (A, B) --> C);
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   242
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   243
fun mk_split t =
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   244
  (case Term.fastype_of t of
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   245
    T as (Type ("fun", [A, Type ("fun", [B, C])])) =>
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   246
      Const ("split", T --> mk_prodT (A, B) --> C) $ t
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   247
  | _ => raise TERM ("mk_split: bad body type", [t]));
83e92f9b32c4 added mk_split;
wenzelm
parents: 17083
diff changeset
   248
5096
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
   249
(*Maps the type T1 * ... * Tn to [T1, ..., Tn], however nested*)
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
   250
fun prodT_factors (Type ("*", [T1, T2])) = prodT_factors T1 @ prodT_factors T2
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
   251
  | prodT_factors T = [T];
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
   252
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
   253
(*Makes a nested tuple from a list, following the product type structure*)
16971
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   254
fun mk_tuple (Type ("*", [T1, T2])) tms =
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   255
        mk_prod (mk_tuple T1 tms,
15570
8d8c70b41bab Move towards standard functions.
skalberg
parents: 15151
diff changeset
   256
                 mk_tuple T2 (Library.drop (length (prodT_factors T1), tms)))
5096
84b00be693b4 Moved most of the Prod_Syntax - stuff to HOLogic.
berghofe
parents: 4571
diff changeset
   257
  | mk_tuple T (t::_) = t;
4571
6b02fc8a97f6 added unit and prod stuff;
wenzelm
parents: 4466
diff changeset
   258
5207
wenzelm
parents: 5096
diff changeset
   259
wenzelm
parents: 5096
diff changeset
   260
(* nat *)
wenzelm
parents: 5096
diff changeset
   261
wenzelm
parents: 5096
diff changeset
   262
val natT = Type ("nat", []);
wenzelm
parents: 5096
diff changeset
   263
wenzelm
parents: 5096
diff changeset
   264
val zero = Const ("0", natT);
wenzelm
parents: 5096
diff changeset
   265
wenzelm
parents: 5096
diff changeset
   266
fun is_zero (Const ("0", _)) = true
wenzelm
parents: 5096
diff changeset
   267
  | is_zero _ = false;
wenzelm
parents: 5096
diff changeset
   268
wenzelm
parents: 5096
diff changeset
   269
fun mk_Suc t = Const ("Suc", natT --> natT) $ t;
wenzelm
parents: 5096
diff changeset
   270
wenzelm
parents: 5096
diff changeset
   271
fun dest_Suc (Const ("Suc", _) $ t) = t
wenzelm
parents: 5096
diff changeset
   272
  | dest_Suc t = raise TERM ("dest_Suc", [t]);
wenzelm
parents: 5096
diff changeset
   273
wenzelm
parents: 5096
diff changeset
   274
fun mk_nat 0 = zero
wenzelm
parents: 5096
diff changeset
   275
  | mk_nat n = mk_Suc (mk_nat (n - 1));
wenzelm
parents: 5096
diff changeset
   276
wenzelm
parents: 5096
diff changeset
   277
fun dest_nat (Const ("0", _)) = 0
wenzelm
parents: 5096
diff changeset
   278
  | dest_nat (Const ("Suc", _) $ t) = dest_nat t + 1
wenzelm
parents: 5096
diff changeset
   279
  | dest_nat t = raise TERM ("dest_nat", [t]);
wenzelm
parents: 5096
diff changeset
   280
wenzelm
parents: 5096
diff changeset
   281
20485
3078fd2eec7b got rid of Numeral.bin type
haftmann
parents: 19481
diff changeset
   282
(* binary numerals and int *)
7073
a959b4391fd8 added boolean and binary constants
paulson
parents: 6380
diff changeset
   283
20485
3078fd2eec7b got rid of Numeral.bin type
haftmann
parents: 19481
diff changeset
   284
val intT = Type ("IntDef.int", []);
15620
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   285
val bitT = Type ("Numeral.bit", []);
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   286
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   287
val B0_const = Const ("Numeral.bit.B0", bitT);
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   288
val B1_const =  Const ("Numeral.bit.B1", bitT);
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   289
20485
3078fd2eec7b got rid of Numeral.bin type
haftmann
parents: 19481
diff changeset
   290
val pls_const = Const ("Numeral.Pls", intT)
3078fd2eec7b got rid of Numeral.bin type
haftmann
parents: 19481
diff changeset
   291
and min_const = Const ("Numeral.Min", intT)
3078fd2eec7b got rid of Numeral.bin type
haftmann
parents: 19481
diff changeset
   292
and bit_const = Const ("Numeral.Bit", [intT, bitT] ---> intT);
8768
9f18aba48519 number_of now takes a type arg
paulson
parents: 8739
diff changeset
   293
20485
3078fd2eec7b got rid of Numeral.bin type
haftmann
parents: 19481
diff changeset
   294
fun number_of_const T = Const ("Numeral.number_of", intT --> T);
8739
60a1ed9e3c34 added number_of_const: term
paulson
parents: 8429
diff changeset
   295
16971
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   296
fun int_of [] = 0
15965
f422f8283491 Use of IntInf.int instead of int in most numeric simprocs; avoids
paulson
parents: 15945
diff changeset
   297
  | int_of (b :: bs) = IntInf.fromInt b + (2 * int_of bs);
15595
dc8a41c7cefc fix integer overflow in numeral syntax for SML NJ.
obua
parents: 15574
diff changeset
   298
15620
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   299
(*When called from a print translation, the Numeral qualifier will probably have
20485
3078fd2eec7b got rid of Numeral.bin type
haftmann
parents: 19481
diff changeset
   300
  been removed from Bit, bit.B0, etc.*)
15620
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   301
fun dest_bit (Const ("Numeral.bit.B0", _)) = 0
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   302
  | dest_bit (Const ("Numeral.bit.B1", _)) = 1
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   303
  | dest_bit (Const ("bit.B0", _)) = 0
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   304
  | dest_bit (Const ("bit.B1", _)) = 1
7548
9e29a3af64ab ROOT: Integ/bin_simprocs.ML now loaded in Integ/Bin.ML
nipkow
parents: 7163
diff changeset
   305
  | dest_bit t = raise TERM("dest_bit", [t]);
9e29a3af64ab ROOT: Integ/bin_simprocs.ML now loaded in Integ/Bin.ML
nipkow
parents: 7163
diff changeset
   306
15013
34264f5e4691 new treatment of binary numerals
paulson
parents: 14387
diff changeset
   307
fun bin_of (Const ("Numeral.Pls", _)) = []
34264f5e4691 new treatment of binary numerals
paulson
parents: 14387
diff changeset
   308
  | bin_of (Const ("Numeral.Min", _)) = [~1]
34264f5e4691 new treatment of binary numerals
paulson
parents: 14387
diff changeset
   309
  | bin_of (Const ("Numeral.Bit", _) $ bs $ b) = dest_bit b :: bin_of bs
15620
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   310
  | bin_of (Const ("Bit", _) $ bs $ b) = dest_bit b :: bin_of bs
7548
9e29a3af64ab ROOT: Integ/bin_simprocs.ML now loaded in Integ/Bin.ML
nipkow
parents: 7163
diff changeset
   311
  | bin_of t = raise TERM("bin_of", [t]);
9e29a3af64ab ROOT: Integ/bin_simprocs.ML now loaded in Integ/Bin.ML
nipkow
parents: 7163
diff changeset
   312
9e29a3af64ab ROOT: Integ/bin_simprocs.ML now loaded in Integ/Bin.ML
nipkow
parents: 7163
diff changeset
   313
val dest_binum = int_of o bin_of;
9e29a3af64ab ROOT: Integ/bin_simprocs.ML now loaded in Integ/Bin.ML
nipkow
parents: 7163
diff changeset
   314
15620
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   315
fun mk_bit 0 = B0_const
8ccdc8bc66a2 replaced bool by a new datatype "bit" for binary numerals
paulson
parents: 15595
diff changeset
   316
  | mk_bit 1 = B1_const
10693
9e4a0e84d0d6 moved mk_bin from Numerals to HOLogic
nipkow
parents: 10384
diff changeset
   317
  | mk_bit _ = sys_error "mk_bit";
9e4a0e84d0d6 moved mk_bin from Numerals to HOLogic
nipkow
parents: 10384
diff changeset
   318
19481
a6205c6203ea renamed HOLogic.mk_bin to mk_binum for consistency with dest_binum
paulson
parents: 18285
diff changeset
   319
fun mk_binum n =
16971
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   320
  let
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   321
    fun mk_bit n = if n = 0 then B0_const else B1_const;
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   322
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   323
    fun bin_of n =
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   324
      if n = 0 then pls_const
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   325
      else if n = ~1 then min_const
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   326
      else
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   327
        let
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   328
          (*val (q,r) = IntInf.divMod (n, 2): doesn't work in SML 110.0.7,
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   329
            but in newer versions!  FIXME: put this back after new SML released!*)
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   330
          val q = IntInf.div (n, 2);
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   331
          val r = IntInf.mod (n, 2);
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   332
        in bit_const $ bin_of q $ mk_bit r end;
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   333
  in bin_of n end;
13755
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   334
14103
afd168fdcd3a mk_int now produces specific constants for 0 and 1.
berghofe
parents: 14048
diff changeset
   335
fun mk_int 0 = Const ("0", intT)
afd168fdcd3a mk_int now produces specific constants for 0 and 1.
berghofe
parents: 14048
diff changeset
   336
  | mk_int 1 = Const ("1", intT)
19481
a6205c6203ea renamed HOLogic.mk_bin to mk_binum for consistency with dest_binum
paulson
parents: 18285
diff changeset
   337
  | mk_int i = number_of_const intT $ mk_binum i;
13755
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   338
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   339
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   340
(* real *)
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   341
16971
968adbfbf93b removed read_cterm;
wenzelm
parents: 16835
diff changeset
   342
val realT = Type ("RealDef.real", []);
13755
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   343
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   344
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   345
(* list *)
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   346
17083
051b0897bc98 added listT
nipkow
parents: 16971
diff changeset
   347
fun listT T =  Type ("List.list", [T])
051b0897bc98 added listT
nipkow
parents: 16971
diff changeset
   348
051b0897bc98 added listT
nipkow
parents: 16971
diff changeset
   349
fun mk_list f T [] = Const ("List.list.Nil", listT T)
13755
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   350
  | mk_list f T (x :: xs) = Const ("List.list.Cons",
17083
051b0897bc98 added listT
nipkow
parents: 16971
diff changeset
   351
      T --> listT T --> listT T) $ f x $
13755
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   352
        mk_list f T xs;
a9bb54a3cfb7 Added mk_int and mk_list.
berghofe
parents: 13743
diff changeset
   353
15062
8049f217428e Added function dest_list.
berghofe
parents: 15013
diff changeset
   354
fun dest_list (Const ("List.list.Nil", _)) = []
8049f217428e Added function dest_list.
berghofe
parents: 15013
diff changeset
   355
  | dest_list (Const ("List.list.Cons", _) $ x $ xs) = x :: dest_list xs
8049f217428e Added function dest_list.
berghofe
parents: 15013
diff changeset
   356
  | dest_list t = raise TERM ("dest_list", [t]);
8049f217428e Added function dest_list.
berghofe
parents: 15013
diff changeset
   357
923
ff1574a81019 new version of HOL with curried function application
clasohm
parents:
diff changeset
   358
end;