Drop identityEquals from builtins, compiler and tests.

This commit is contained in:
Ilya Gorbunov
2016-01-21 19:40:46 +03:00
parent f5f5a2dcc1
commit 4d5ec9be3f
44 changed files with 66 additions and 185 deletions
@@ -2,7 +2,6 @@ class Test {
fun check(a: Any?): String {
if (this === a) return "Fail 1"
if (!(this !== a)) return "Fail 2"
if (this.identityEquals(a)) return "Fail 3"
return "OK"
}
}
+1 -1
View File
@@ -4,5 +4,5 @@ fun box(): String {
val r = object : Runnable {
override fun run() {}
}
return if (foo(r).identityEquals(r)) "OK" else "Fail"
return if (foo(r) === r) "OK" else "Fail"
}
+1 -1
View File
@@ -4,5 +4,5 @@ fun box(): String {
val r = object : Runnable {
override fun run() {}
}
return if (foo(r).identityEquals(r)) "OK" else "Fail"
return if (foo(r) === r) "OK" else "Fail"
}
+4 -4
View File
@@ -7,10 +7,10 @@ class Foo {
fun box() : String {
val a = Foo()
val b = Foo()
if (!a.identityEquals(a)) return "fail 1"
if (!b.identityEquals(b)) return "fail 2"
if (b.identityEquals(a)) return "fail 3"
if (a.identityEquals(b)) return "fail 4"
if (a !== a) return "fail 1"
if (b !== b) return "fail 2"
if (b === a) return "fail 3"
if (a === b) return "fail 4"
if( a !=b ) return "fail5"
return "OK"
}
@@ -6,6 +6,6 @@ fun box(): String {
val a = A(42)
val b = a.clone()
if (b != a) return "Fail equals"
if (b.identityEquals(a)) return "Fail identity"
if (b === a) return "Fail identity"
return "OK"
}
@@ -6,6 +6,6 @@ fun box(): String {
val a = A(42)
val b = a.clone()
if (a != b) return "Fail equals"
if (a.identityEquals(b)) return "Fail identity"
if (a === b) return "Fail identity"
return "OK"
}
@@ -10,7 +10,7 @@ fun box(): String {
val a = A(42)
val b = a.clone()
if (a == b) return "Fail: $a == $b"
if (a.identityEquals(b)) return "Fail: $a identityEquals $b"
if (a === b) return "Fail: $a === $b"
if (b.x != 239) return "Fail: b.x = ${b.x}"
return "OK"
}
@@ -7,6 +7,6 @@ fun box(): String {
a.add("prosper")
val b = a.clone()
if (a != b) return "Fail equals"
if (a.identityEquals(b)) return "Fail identity"
if (a === b) return "Fail identity"
return "OK"
}
@@ -25,8 +25,8 @@ fun box(): String {
if (c.s != d.s) return "Fail s: ${d.s}"
if (c.l != d.l) return "Fail l: ${d.l}"
if (c.l.identityEquals(d.l)) return "Fail list identity"
if (c.identityEquals(d)) return "Fail identity"
if (c.l === d.l) return "Fail list identity"
if (c === d) return "Fail identity"
return "OK"
}
@@ -6,6 +6,6 @@ fun box(): String {
val a = A("OK")
val b = a.externalClone()
if (a != b) return "Fail equals"
if (a.identityEquals(b)) return "Fail identity"
if (a === b) return "Fail identity"
return b.s
}
@@ -13,23 +13,23 @@ fun box(): String {
val a = original
a += 1
if (!(a.identityEquals(original))) return "Fail 1: $a !== $original"
if (a !== original) return "Fail 1: $a !== $original"
if (a.x != 1) return "Fail 2: ${a.x} != 1"
a -= 2
if (!(a.identityEquals(original))) return "Fail 3: $a !== $original"
if (a !== original) return "Fail 3: $a !== $original"
if (a.x != -1) return "Fail 4: ${a.x} != -1"
a *= -10
if (!(a.identityEquals(original))) return "Fail 5: $a !== $original"
if (a !== original) return "Fail 5: $a !== $original"
if (a.x != 10) return "Fail 6: ${a.x} != 10"
a /= 3
if (!(a.identityEquals(original))) return "Fail 7: $a !== $original"
if (a !== original) return "Fail 7: $a !== $original"
if (a.x != 3) return "Fail 8: ${a.x} != 3"
a %= 2
if (!(a.identityEquals(original))) return "Fail 9: $a !== $original"
if (a !== original) return "Fail 9: $a !== $original"
if (a.x != 1) return "Fail 10: ${a.x} != 1"
return "OK"
@@ -9,12 +9,5 @@ fun box(): String {
val x2 = l[0] === l[0]
if (!x2) return "Fail 2: $x"
val y = l[0].identityEquals(1000)
if (y) return "Fail (y): $y"
val y1 = l[0].identityEquals(1)
if (y1) return "Fail (y1): $y"
val y2 = l[0].identityEquals(l[0])
if (!y2) return "Fail (y2): $y"
return "OK"
}
+2 -2
View File
@@ -1,6 +1,6 @@
fun box() : String {
val a = "lala"
if(!a.identityEquals(a)) return "fail 1"
if(a.identityEquals(a)) return "OK"
if(a !== a) return "fail 1"
if(a === a) return "OK"
return "fail 2"
}
+1 -1
View File
@@ -1,7 +1,7 @@
val f : (Any) -> String = { it.toString() }
fun box() : String {
if(!(f.identityEquals(f))) return "fail 1"
if(!(f === f)) return "fail 1"
if(!(f == f)) return "fail 2"
if(!(f.equals(f))) return "fail 3"
return "OK"