Minor, delete Object from some test data

This commit is contained in:
Alexander Udalov
2014-07-25 16:44:31 +04:00
parent a5321ba9f0
commit 98ffdb3e32
7 changed files with 32 additions and 33 deletions
@@ -1,6 +1,6 @@
class Works() : Function0<Object> { class Works() : Function0<Any> {
public override fun invoke():Object { public override fun invoke():Any {
return "Works" as Object return "Works" as Any
} }
} }
class Broken() : Function0<String> { class Broken() : Function0<String> {
@@ -10,7 +10,7 @@ class Broken() : Function0<String> {
} }
fun box(): String { fun box(): String {
val works1: ()->Object = Works(); val works1: ()->Any = Works();
works1() works1()
val broken1: ()->String = Broken(); val broken1: ()->String = Broken();
@@ -1,4 +1,4 @@
open abstract class B() : java.lang.Object() { open abstract class B {
fun foo(arg: Int = 239 + 1) : Int = arg fun foo(arg: Int = 239 + 1) : Int = arg
} }
@@ -1,4 +1,4 @@
fun <T> T.toPrefixedString(prefix: String = "", suffix: String="") = prefix + (this as java.lang.Object).toString() + suffix fun <T> T.toPrefixedString(prefix: String = "", suffix: String="") = prefix + this.toString() + suffix
fun box() : String { fun box() : String {
if("mama".toPrefixedString(suffix="321", prefix="papa") != "papamama321") return "fail" if("mama".toPrefixedString(suffix="321", prefix="papa") != "papamama321") return "fail"
@@ -4,12 +4,11 @@ trait A {
fun bar(arg: Int = 240) : Int = bar2(arg/2) fun bar(arg: Int = 240) : Int = bar2(arg/2)
} }
open abstract class B() : A, java.lang.Object() { open abstract class B : A {
override fun bar2(arg: Int) : Int = arg override fun bar2(arg: Int) : Int = arg
} }
class C() : B() { class C : B()
}
fun box() : String { fun box() : String {
if(C().bar(10) != 5) return "fail" if(C().bar(10) != 5) return "fail"
@@ -1,8 +1,8 @@
open abstract class B() : java.lang.Object() { open abstract class B {
abstract fun foo2(arg: Int = 239) : Int abstract fun foo2(arg: Int = 239) : Int
} }
class C() : B() { class C : B() {
override fun foo2(arg: Int) : Int = arg override fun foo2(arg: Int) : Int = arg
} }
@@ -1,18 +1,18 @@
class C(x: Int, val y : Int) { class C(x: Int, val y: Int) {
fun initChild(x0: Int) : java.lang.Object { fun initChild(x0: Int): Any {
var x = x0 var x = x0
return object : java.lang.Object() { return object {
override fun toString(): String { override fun toString(): String {
x = x + y x = x + y
return "child" + x return "child" + x
} }
}
} }
}
val child = initChild(x) val child = initChild(x)
} }
fun box(): String { fun box(): String {
val c = C(10,3) val c = C(10, 3)
return if (c.child.toString() == "child13" && c.child.toString() == "child16" && c.child.toString() == "child19") "OK" else "fail" return if (c.child.toString() == "child13" && c.child.toString() == "child16" && c.child.toString() == "child19") "OK" else "fail"
} }
@@ -1,17 +1,17 @@
package p package p
class C(val y : Int) { class C(val y: Int) {
val initChild = { -> val initChild = { ->
object : java.lang.Object() { object {
override fun toString(): String { override fun toString(): String {
return "child" + y return "child" + y
} }
}
} }
}
} }
fun box(): String { fun box(): String {
val c = C(3).initChild val c = C(3).initChild
val x = c().toString() val x = c().toString()
return if(x == "child3") "OK" else x return if (x == "child3") "OK" else x
} }