split SuperGenTest.enclosed

This commit is contained in:
Stepan Koltsov
2012-02-09 23:40:43 +04:00
parent 8e6e8e938c
commit 9b6e051dc1
3 changed files with 31 additions and 14 deletions
@@ -8,26 +8,17 @@ trait K : BK {
open class M() {
open fun x() : Int = 10
open var y = 500
}
open class N() : M(), K {
override fun x() : Int = 20
override var y = 200
open class C() : K {
fun test1() = x()
fun test2() = super<M>@N.x()
fun test3() = super<K>@N.x()
fun test4() = super<K>.x()
fun test5() = y
fun test6() : Int {
super<M>@N.y += 200
return super<M>@N.y
}
}
}
@@ -36,7 +27,5 @@ fun box(): String {
if (N().C().test2() != 10) return "test2 fail";
if (N().C().test3() != 100) return "test3 fail";
if (N().C().test4() != 100) return "test4 fail";
if (N().C().test5() != 200) return "test5 fail";
if (N().C().test6() != 700) return "test6 fail";
return "OK";
}
}
@@ -0,0 +1,22 @@
open class M() {
open var y = 500
}
open class N() : M() {
override var y = 200
open class C() {
fun test5() = y
fun test6() : Int {
super<M>@N.y += 200
return super<M>@N.y
}
}
}
fun box(): String {
if (N().C().test5() != 200) return "test5 fail";
if (N().C().test6() != 700) return "test6 fail";
return "OK";
}