Make all progression headers inclusive, and decrement last for
last-exclusive progressions (i.e., "until" progressions and loop over array indices). This change makes it possible to correctly implement the handling of "step" progressions. Computing the last element of a stepped progression requires that the last is inclusive. Also invert the while loop (into if + do-while) that is used when lowering for-loops over progressions that cannot overflow. This keeps the performance characteristics closer to the ForLoopsLowering in kotlin-native, since the goal is to converge to this shared version. Also used IrType instead of KotlinType, where possible. https://github.com/JetBrains/kotlin/pull/2390 https://github.com/JetBrains/kotlin/pull/2305
This commit is contained in:
committed by
Mikhael Bogdanov
parent
39f6416757
commit
de1e27c584
+21
@@ -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;", 4) downTo logged("end;", 1)).reversed().reversed()) {
|
||||
sum = sum * 10 + i
|
||||
}
|
||||
|
||||
assertEquals(4321, sum)
|
||||
|
||||
assertEquals("start;end;", log.toString())
|
||||
|
||||
return "OK"
|
||||
}
|
||||
+21
@@ -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;", 4)).reversed().reversed()) {
|
||||
sum = sum * 10 + i
|
||||
}
|
||||
|
||||
assertEquals(1234, sum)
|
||||
|
||||
assertEquals("start;end;", log.toString())
|
||||
|
||||
return "OK"
|
||||
}
|
||||
+21
@@ -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;", 5)).reversed().reversed()) {
|
||||
sum = sum * 10 + i
|
||||
}
|
||||
|
||||
assertEquals(1234, sum)
|
||||
|
||||
assertEquals("start;end;", log.toString())
|
||||
|
||||
return "OK"
|
||||
}
|
||||
Reference in New Issue
Block a user