--- a/src/HOL/Datatype_Examples/Misc_Datatype.thy Thu Sep 11 19:26:59 2014 +0200
+++ b/src/HOL/Datatype_Examples/Misc_Datatype.thy Thu Sep 11 19:32:36 2014 +0200
@@ -13,26 +13,26 @@
imports "~~/src/HOL/Library/Countable" "~~/src/HOL/Library/FSet"
begin
-datatype_new (discs_sels) simple = X1 | X2 | X3 | X4
+datatype (discs_sels) simple = X1 | X2 | X3 | X4
-datatype_new (discs_sels) simple' = X1' unit | X2' unit | X3' unit | X4' unit
+datatype (discs_sels) simple' = X1' unit | X2' unit | X3' unit | X4' unit
-datatype_new (discs_sels) simple'' = X1'' nat int | X2''
+datatype (discs_sels) simple'' = X1'' nat int | X2''
-datatype_new (discs_sels) 'a mylist = MyNil | MyCons (myhd: 'a) (mytl: "'a mylist")
+datatype (discs_sels) 'a mylist = MyNil | MyCons (myhd: 'a) (mytl: "'a mylist")
-datatype_new (discs_sels) ('b, 'c :: ord, 'd, 'e) some_passive =
+datatype (discs_sels) ('b, 'c :: ord, 'd, 'e) some_passive =
SP1 "('b, 'c, 'd, 'e) some_passive" | SP2 'b | SP3 'c | SP4 'd | SP5 'e
-datatype_new (discs_sels) hfset = HFset "hfset fset"
+datatype (discs_sels) hfset = HFset "hfset fset"
-datatype_new (discs_sels) lambda =
+datatype (discs_sels) lambda =
Var string |
App lambda lambda |
Abs string lambda |
Let "(string \<times> lambda) fset" lambda
-datatype_new (discs_sels) 'a par_lambda =
+datatype (discs_sels) 'a par_lambda =
PVar 'a |
PApp "'a par_lambda" "'a par_lambda" |
PAbs 'a "'a par_lambda" |
@@ -43,70 +43,70 @@
('a, 'b1, 'b2) F2 = unit + 'b1 * 'b2
*)
-datatype_new (discs_sels) 'a I1 = I11 'a "'a I1" | I12 'a "'a I2"
+datatype (discs_sels) 'a I1 = I11 'a "'a I1" | I12 'a "'a I2"
and 'a I2 = I21 | I22 "'a I1" "'a I2"
-datatype_new (discs_sels) 'a tree = TEmpty | TNode 'a "'a forest"
+datatype (discs_sels) 'a tree = TEmpty | TNode 'a "'a forest"
and 'a forest = FNil | FCons "'a tree" "'a forest"
-datatype_new (discs_sels) 'a tree' = TEmpty' | TNode' "'a branch" "'a branch"
+datatype (discs_sels) 'a tree' = TEmpty' | TNode' "'a branch" "'a branch"
and 'a branch = Branch 'a "'a tree'"
-datatype_new (discs_sels) 'a bin_rose_tree = BRTree 'a "'a bin_rose_tree mylist" "'a bin_rose_tree mylist"
+datatype (discs_sels) 'a bin_rose_tree = BRTree 'a "'a bin_rose_tree mylist" "'a bin_rose_tree mylist"
-datatype_new (discs_sels) ('a, 'b) exp = Term "('a, 'b) trm" | Sum "('a, 'b) trm" "('a, 'b) exp"
+datatype (discs_sels) ('a, 'b) exp = Term "('a, 'b) trm" | Sum "('a, 'b) trm" "('a, 'b) exp"
and ('a, 'b) trm = Factor "('a, 'b) factor" | Prod "('a, 'b) factor" "('a, 'b) trm"
and ('a, 'b) factor = C 'a | V 'b | Paren "('a, 'b) exp"
-datatype_new (discs_sels) 'a ftree = FTLeaf 'a | FTNode "'a \<Rightarrow> 'a ftree"
+datatype (discs_sels) 'a ftree = FTLeaf 'a | FTNode "'a \<Rightarrow> 'a ftree"
-datatype_new (discs_sels) ('a, 'b, 'c) some_killing =
+datatype (discs_sels) ('a, 'b, 'c) some_killing =
SK "'a \<Rightarrow> 'b \<Rightarrow> ('a, 'b, 'c) some_killing + ('a, 'b, 'c) in_here"
and ('a, 'b, 'c) in_here =
IH1 'b 'a | IH2 'c
-datatype_new (discs_sels) 'b nofail1 = NF11 "'b nofail1" 'b | NF12 'b
-datatype_new (discs_sels) 'b nofail2 = NF2 "('b nofail2 \<times> 'b \<times> 'b nofail2 \<times> 'b) list"
-datatype_new (discs_sels) 'b nofail3 = NF3 'b "('b nofail3 \<times> 'b \<times> 'b nofail3 \<times> 'b) fset"
-datatype_new (discs_sels) 'b nofail4 = NF4 "('b nofail4 \<times> ('b nofail4 \<times> 'b \<times> 'b nofail4 \<times> 'b) fset) list"
+datatype (discs_sels) 'b nofail1 = NF11 "'b nofail1" 'b | NF12 'b
+datatype (discs_sels) 'b nofail2 = NF2 "('b nofail2 \<times> 'b \<times> 'b nofail2 \<times> 'b) list"
+datatype (discs_sels) 'b nofail3 = NF3 'b "('b nofail3 \<times> 'b \<times> 'b nofail3 \<times> 'b) fset"
+datatype (discs_sels) 'b nofail4 = NF4 "('b nofail4 \<times> ('b nofail4 \<times> 'b \<times> 'b nofail4 \<times> 'b) fset) list"
(*
-datatype_new (discs_sels) 'b fail = F "'b fail" 'b "'b fail" "'b list"
-datatype_new (discs_sels) 'b fail = F "'b fail" 'b "'b fail" 'b
-datatype_new (discs_sels) 'b fail = F1 "'b fail" 'b | F2 "'b fail"
-datatype_new (discs_sels) 'b fail = F "'b fail" 'b
+datatype (discs_sels) 'b fail = F "'b fail" 'b "'b fail" "'b list"
+datatype (discs_sels) 'b fail = F "'b fail" 'b "'b fail" 'b
+datatype (discs_sels) 'b fail = F1 "'b fail" 'b | F2 "'b fail"
+datatype (discs_sels) 'b fail = F "'b fail" 'b
*)
-datatype_new (discs_sels) l1 = L1 "l2 list"
+datatype (discs_sels) l1 = L1 "l2 list"
and l2 = L21 "l1 fset" | L22 l2
-datatype_new (discs_sels) kk1 = KK1 kk2
+datatype (discs_sels) kk1 = KK1 kk2
and kk2 = KK2 kk3
and kk3 = KK3 "kk1 list"
-datatype_new (discs_sels) t1 = T11 t3 | T12 t2
+datatype (discs_sels) t1 = T11 t3 | T12 t2
and t2 = T2 t1
and t3 = T3
-datatype_new (discs_sels) t1' = T11' t2' | T12' t3'
+datatype (discs_sels) t1' = T11' t2' | T12' t3'
and t2' = T2' t1'
and t3' = T3'
(*
-datatype_new (discs_sels) fail1 = F1 fail2
+datatype (discs_sels) fail1 = F1 fail2
and fail2 = F2 fail3
and fail3 = F3 fail1
-datatype_new (discs_sels) fail1 = F1 "fail2 list" fail2
+datatype (discs_sels) fail1 = F1 "fail2 list" fail2
and fail2 = F2 "fail2 fset" fail3
and fail3 = F3 fail1
-datatype_new (discs_sels) fail1 = F1 "fail2 list" fail2
+datatype (discs_sels) fail1 = F1 "fail2 list" fail2
and fail2 = F2 "fail1 fset" fail1
*)
(* SLOW
-datatype_new (discs_sels) ('a, 'c) D1 = A1 "('a, 'c) D2" | B1 "'a list"
+datatype (discs_sels) ('a, 'c) D1 = A1 "('a, 'c) D2" | B1 "'a list"
and ('a, 'c) D2 = A2 "('a, 'c) D3" | B2 "'c list"
and ('a, 'c) D3 = A3 "('a, 'c) D3" | B3 "('a, 'c) D4" | C3 "('a, 'c) D4" "('a, 'c) D5"
and ('a, 'c) D4 = A4 "('a, 'c) D5" | B4 "'a list list list"
@@ -117,24 +117,24 @@
*)
(* fail:
-datatype_new (discs_sels) tt1 = TT11 tt2 tt3 | TT12 tt2 tt4
+datatype (discs_sels) tt1 = TT11 tt2 tt3 | TT12 tt2 tt4
and tt2 = TT2
and tt3 = TT3 tt4
and tt4 = TT4 tt1
*)
-datatype_new (discs_sels) k1 = K11 k2 k3 | K12 k2 k4
+datatype (discs_sels) k1 = K11 k2 k3 | K12 k2 k4
and k2 = K2
and k3 = K3 k4
and k4 = K4
-datatype_new (discs_sels) tt1 = TT11 tt3 tt2 | TT12 tt2 tt4
+datatype (discs_sels) tt1 = TT11 tt3 tt2 | TT12 tt2 tt4
and tt2 = TT2
and tt3 = TT3 tt1
and tt4 = TT4
(* SLOW
-datatype_new (discs_sels) s1 = S11 s2 s3 s4 | S12 s3 | S13 s2 s6 | S14 s4 s2 | S15 s2 s2
+datatype (discs_sels) s1 = S11 s2 s3 s4 | S12 s3 | S13 s2 s6 | S14 s4 s2 | S15 s2 s2
and s2 = S21 s7 s5 | S22 s5 s4 s6
and s3 = S31 s1 s7 s2 | S32 s3 s3 | S33 s4 s5
and s4 = S4 s5
@@ -144,35 +144,35 @@
and s8 = S8 nat
*)
-datatype_new (discs_sels) 'a deadbar = DeadBar "'a \<Rightarrow> 'a"
-datatype_new (discs_sels) 'a deadbar_option = DeadBarOption "'a option \<Rightarrow> 'a option"
-datatype_new (discs_sels) ('a, 'b) bar = Bar "'b \<Rightarrow> 'a"
-datatype_new (discs_sels) ('a, 'b, 'c, 'd) foo = Foo "'d + 'b \<Rightarrow> 'c + 'a"
-datatype_new (discs_sels) 'a deadfoo = DeadFoo "'a \<Rightarrow> 'a + 'a"
+datatype (discs_sels) 'a deadbar = DeadBar "'a \<Rightarrow> 'a"
+datatype (discs_sels) 'a deadbar_option = DeadBarOption "'a option \<Rightarrow> 'a option"
+datatype (discs_sels) ('a, 'b) bar = Bar "'b \<Rightarrow> 'a"
+datatype (discs_sels) ('a, 'b, 'c, 'd) foo = Foo "'d + 'b \<Rightarrow> 'c + 'a"
+datatype (discs_sels) 'a deadfoo = DeadFoo "'a \<Rightarrow> 'a + 'a"
-datatype_new (discs_sels) 'a dead_foo = A
-datatype_new (discs_sels) ('a, 'b) use_dead_foo = Y "'a" "'b dead_foo"
+datatype (discs_sels) 'a dead_foo = A
+datatype (discs_sels) ('a, 'b) use_dead_foo = Y "'a" "'b dead_foo"
-datatype_new (discs_sels) d1 = D
-datatype_new (discs_sels) d1' = is_D: D
+datatype (discs_sels) d1 = D
+datatype (discs_sels) d1' = is_D: D
-datatype_new (discs_sels) d2 = D nat
-datatype_new (discs_sels) d2' = is_D: D nat
+datatype (discs_sels) d2 = D nat
+datatype (discs_sels) d2' = is_D: D nat
-datatype_new (discs_sels) d3 = D | E
-datatype_new (discs_sels) d3' = D | is_E: E
-datatype_new (discs_sels) d3'' = is_D: D | E
-datatype_new (discs_sels) d3''' = is_D: D | is_E: E
+datatype (discs_sels) d3 = D | E
+datatype (discs_sels) d3' = D | is_E: E
+datatype (discs_sels) d3'' = is_D: D | E
+datatype (discs_sels) d3''' = is_D: D | is_E: E
-datatype_new (discs_sels) d4 = D nat | E
-datatype_new (discs_sels) d4' = D nat | is_E: E
-datatype_new (discs_sels) d4'' = is_D: D nat | E
-datatype_new (discs_sels) d4''' = is_D: D nat | is_E: E
+datatype (discs_sels) d4 = D nat | E
+datatype (discs_sels) d4' = D nat | is_E: E
+datatype (discs_sels) d4'' = is_D: D nat | E
+datatype (discs_sels) d4''' = is_D: D nat | is_E: E
-datatype_new (discs_sels) d5 = D nat | E int
-datatype_new (discs_sels) d5' = D nat | is_E: E int
-datatype_new (discs_sels) d5'' = is_D: D nat | E int
-datatype_new (discs_sels) d5''' = is_D: D nat | is_E: E int
+datatype (discs_sels) d5 = D nat | E int
+datatype (discs_sels) d5' = D nat | is_E: E int
+datatype (discs_sels) d5'' = is_D: D nat | E int
+datatype (discs_sels) d5''' = is_D: D nat | is_E: E int
instance simple :: countable
by countable_datatype