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

JS backend: fixed wrong result when compare null and undefined using Kotlin.equals.

Browse Source
This commit is contained in:
Zalim Bashorov
2013-07-16 16:19:34 +04:00
parent 539756ff3e
commit c5f53df70d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testFiles/expression/equals/cases/equalsNullOrUndefined.kt
+7
View File
@@ -1,11 +1,18 @@
package foo package foo
native val undefined: Any = noImpl
fun box() : String { fun box() : String {
val a: Int? = null val a: Int? = null
val r = a == null val r = a == null
if (!r || a != null) if (!r || a != null)
return "wrong result on simple nullable check" return "wrong result on simple nullable check"
//force using Kotlin.equals
val t = null
if (t != undefined)
return "wrong result when compare null and undefined using Kotlin.equals"
var i = 0; var i = 0;
fun foo(): Int? = ++i; fun foo(): Int? = ++i;
if (foo() == null) if (foo() == null)
js/js.translator/testFiles/kotlin_lib.js
+2 -2
View File
@@ -36,8 +36,8 @@ var kotlin = {set:function (receiver, key, value) {
(function () { (function () {
Kotlin.equals = function (obj1, obj2) { Kotlin.equals = function (obj1, obj2) {
if (obj1 === null || obj1 === undefined) { if (obj1 == null) {
return obj2 === null; return obj2 == null;
} }
if (obj1 instanceof Array) { if (obj1 instanceof Array) {