Add new tests for step progressions and fix existing tests.

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 8) downTo logged("end;", 1)).reversed() step logged("step;", 2)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(1357, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 8) downTo logged("end;", 1)).reversed() step logged("step;", 2)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(7531, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToReversedStepReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 10) downTo logged("end;", 1)).reversed() step logged("step2;", 2)).reversed() step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(963, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in logged("start;", 8) downTo logged("end;", 1) step logged("step;", 2)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(8642, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 8) downTo logged("end;", 1) step logged("step;", 2)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(2468, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 9) downTo logged("end;", 0) step logged("step2;", 2)).reversed() step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(147, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepReversedStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 9) downTo logged("end;", 0) step logged("step2;", 2)).reversed() step logged("step3;", 3)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(741, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInDownTo/forInDownToStepStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in logged("start;", 9) downTo logged("end;", 0) step logged("step2;", 2) step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(963, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 1)..logged("end;", 8)).reversed() step logged("step;", 2)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(8642, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 1)..logged("end;", 8)).reversed() step logged("step;", 2)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(2468, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralReversedStepReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 1)..logged("end;", 10)).reversed() step logged("step2;", 2)).reversed() step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(258, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in logged("start;", 1)..logged("end;", 8) step logged("step;", 2)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(1357, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 1)..logged("end;", 8) step logged("step;", 2)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(7531, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 1)..logged("end;", 10) step logged("step2;", 2)).reversed() step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(963, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepReversedStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 1)..logged("end;", 10) step logged("step2;", 2)).reversed() step logged("step3;", 3)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(369, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInRangeLiteral/forInRangeLiteralStepStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in logged("start;", 1)..logged("end;", 10) step logged("step2;", 2) step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(147, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 1) until logged("end;", 9)).reversed() step logged("step;", 2)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(8642, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 1) until logged("end;", 9)).reversed() step logged("step;", 2)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(2468, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilReversedStepReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 1) until logged("end;", 11)).reversed() step logged("step2;", 2)).reversed() step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(258, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in logged("start;", 1) until logged("end;", 9) step logged("step;", 2)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(1357, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 1) until logged("end;", 9) step logged("step;", 2)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(7531, sum)
+
+    assertEquals("start;end;step;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in (logged("start;", 1) until logged("end;", 11) step logged("step2;", 2)).reversed() step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(963, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepReversedStepReversed.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in ((logged("start;", 1) until logged("end;", 11) step logged("step2;", 2)).reversed() step logged("step3;", 3)).reversed()) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(369, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}

compiler/testData/codegen/box/ranges/evaluationOrder/stepped/forInUntil/forInUntilStepStep.kt

@@ -0,0 +1,21 @@
+// KJS_WITH_FULL_RUNTIME
+// WITH_RUNTIME
+import kotlin.test.*
+
+val log = StringBuilder()
+
+fun logged(message: String, value: Int) =
+    value.also { log.append(message) }
+
+fun box(): String {
+    var sum = 0
+    for (i in logged("start;", 1) until logged("end;", 11) step logged("step2;", 2) step logged("step3;", 3)) {
+        sum = sum * 10 + i
+    }
+
+    assertEquals(147, sum)
+
+    assertEquals("start;end;step2;step3;", log.toString())
+
+    return "OK"
+}