azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS BE] Fix is check with Function

Browse Source 
#KT-33149 fixed
This commit is contained in:
Zalim Bashorov
2019-12-24 01:51:34 +03:00
parent 04e567dbf9
commit ee06678484
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/box/rtti/isJsPrimitiveNullableType.kt
Vendored
+7 -1
View File
@@ -6,6 +6,7 @@ val STRING = 2
val BOOLEAN = 3
val OBJECT = 4
val FUNCTION = 5
val FUNCTION0 = FUNCTION // right now we can't distinguish functions with different arity
fun testNullable(a: Any?, actualType: Int) {
assertEquals(a == null || actualType == NUMBER, a is Int?, "$a is Int?")
@@ -13,7 +14,8 @@ fun testNullable(a: Any?, actualType: Int) {
assertEquals(a == null || actualType == NUMBER, a is Double?, "$a is Double?")
assertEquals(a == null || actualType == BOOLEAN, a is Boolean?, "$a is Boolean?")
assertEquals(a == null || actualType == STRING, a is String?, "$a is String?")
assertEquals(a == null || actualType == FUNCTION, a is Function0<*>?, "$a is Function?")
assertEquals(a == null || actualType == FUNCTION0, a is Function0<*>?, "$a is Function0?")
assertEquals(a == null || actualType == FUNCTION || actualType == FUNCTION0, a is Function<*>?, "$a is Function?")
}
fun box(): String {
@@ -28,12 +30,16 @@ fun box(): String {
testNullable(false, BOOLEAN)
testNullable(object {}, OBJECT)
testNullable({}, FUNCTION0)
testNullable({}, FUNCTION)
testNullable({a: Any -> }, FUNCTION)
testNullable(null, NUMBER)
testNullable(null, STRING)
testNullable(null, BOOLEAN)
testNullable(null, OBJECT)
testNullable(null, FUNCTION0)
testNullable(null, FUNCTION)
return "OK"
js/js.translator/testData/box/rtti/isJsPrimitiveType.kt
Vendored
+6 -1
View File
@@ -6,6 +6,7 @@ val STRING = 2
val BOOLEAN = 3
val OBJECT = 4
val FUNCTION = 5
val FUNCTION0 = FUNCTION // right now we can't distinguish functions with different arity
fun test(a: Any, actualType: Int) {
assertEquals(actualType == NUMBER, a is Int, "$a is Int")
@@ -13,7 +14,8 @@ fun test(a: Any, actualType: Int) {
assertEquals(actualType == NUMBER, a is Double, "$a is Double")
assertEquals(actualType == BOOLEAN, a is Boolean, "$a is Boolean")
assertEquals(actualType == STRING, a is String, "$a is String")
assertEquals(actualType == FUNCTION, a is Function0<*>, "$a is Function")
assertEquals(actualType == FUNCTION0, a is Function0<*>, "$a is Function0")
assertEquals(actualType == FUNCTION || actualType == FUNCTION0, a is Function<*>, "$a is Function")
}
fun box(): String {
@@ -29,7 +31,10 @@ fun box(): String {
test(object {}, OBJECT)
test({}, FUNCTION0)
test({}, FUNCTION)
test({a: Any -> }, FUNCTION)
return "OK"
}