--- a/src/HOL/HOLCF/Tools/Domain/domain_constructors.ML Mon Sep 01 16:17:46 2014 +0200
+++ b/src/HOL/HOLCF/Tools/Domain/domain_constructors.ML Mon Sep 01 16:17:46 2014 +0200
@@ -113,7 +113,7 @@
: (term list * term list) =
let
val Ts = map snd args
- val ns = Name.variant_list taken (Datatype_Prop.make_tnames Ts)
+ val ns = Name.variant_list taken (Old_Datatype_Prop.make_tnames Ts)
val vs = map Free (ns ~~ Ts)
val nonlazy = map snd (filter_out (fst o fst) (args ~~ vs))
in
@@ -167,7 +167,7 @@
fun vars_of args =
let
val Ts = map snd args
- val ns = Datatype_Prop.make_tnames Ts
+ val ns = Old_Datatype_Prop.make_tnames Ts
in
map Free (ns ~~ Ts)
end
@@ -409,7 +409,7 @@
val tns = map fst (Term.add_tfreesT lhsT [])
val resultT = TFree (singleton (Name.variant_list tns) "'t", @{sort pcpo})
fun fTs T = map (fn (_, args) => map snd args -->> T) spec
- val fns = Datatype_Prop.indexify_names (map (K "f") spec)
+ val fns = Old_Datatype_Prop.indexify_names (map (K "f") spec)
val fs = map Free (fns ~~ fTs resultT)
fun caseT T = fTs T -->> (lhsT ->> T)
@@ -424,7 +424,7 @@
fun one_con f (_, args) =
let
val Ts = map snd args
- val ns = Name.variant_list fns (Datatype_Prop.make_tnames Ts)
+ val ns = Name.variant_list fns (Old_Datatype_Prop.make_tnames Ts)
val vs = map Free (ns ~~ Ts)
in
lambda_args (map fst args ~~ vs) (list_ccomb (f, vs))
@@ -606,7 +606,7 @@
fun sel_apps_of (i, (con, args: (bool * term option * typ) list)) =
let
val Ts : typ list = map #3 args
- val ns : string list = Datatype_Prop.make_tnames Ts
+ val ns : string list = Old_Datatype_Prop.make_tnames Ts
val vs : term list = map Free (ns ~~ Ts)
val con_app : term = list_ccomb (con, vs)
val vs' : (bool * term) list = map #1 args ~~ vs