Merge remote-tracking branch 'origin/master' into incremental

js/js.translator/testData/expression/misc/cases/KT-5058.kt

@@ -0,0 +1,25 @@
+package foo
+
+fun test():Any {
+    val a: Any = "OK"
+    val f: Any =
+            if (true) {
+                when {
+                    false -> "1"
+                    ((a as? String)?.size ?: 0 > 0) -> a
+                    else -> "2"
+                }
+            }
+            else {
+                "3"
+
+            }
+
+    return f
+}
+
+fun box(): Boolean {
+    var result = test()
+    return result == "OK";
+}
+

js/js.translator/testData/kotlin_lib.js

@@ -543,6 +543,9 @@
             },
             iterator: function () {
                 return new Kotlin.RangeIterator(this.start, this.end, this.increment);
+            },
+            isEmpty: function () {
+                return this.start > this.end;
             }
     });
 
@@ -554,6 +557,9 @@
         }, {
         iterator: function () {
             return new Kotlin.RangeIterator(this.start, this.end, this.increment);
+        },
+        isEmpty: function() {
+            return this.increment > 0 ? this.start > this.end : this.start < this.end;
         }
     });
 

js/js.translator/testData/patternMatching/cases/doWhileWithOneStmWhen.kt

@@ -0,0 +1,15 @@
+package foo
+
+
+fun box(): Boolean {
+    var result = false
+    var i = 1
+    do
+        when (i) {
+            1 ->    result = true
+            else -> result = false
+        }
+    while (i==0)
+    return result;
+}
+

js/js.translator/testData/patternMatching/cases/forWithOneStmWhen.kt

@@ -0,0 +1,13 @@
+package foo
+
+
+fun box(): Boolean {
+    var result = false
+    for (i in array(1))
+        when (i) {
+            1 -> result = true
+            else -> result = false
+        }
+    return result;
+}
+

js/js.translator/testData/patternMatching/cases/ifWithOneStmWhen.kt

@@ -0,0 +1,13 @@
+package foo
+
+
+fun box(): Boolean {
+    var result = false
+    var i = 1
+    if (i==1)
+        when (i) {
+            1 ->    result = true
+            else -> result = false
+        }
+    return result;
+}

js/js.translator/testData/patternMatching/cases/whileWithOneStmWhen.kt

@@ -0,0 +1,14 @@
+package foo
+
+
+fun box(): Boolean {
+    var result = false
+    var i = 1
+    while(i==1)
+        when (i) {
+            1 -> { result = true; break }
+            else -> result = false
+        }
+    return result;
+}
+