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

Fix loop over a range literal up to MAX_VALUE

Browse Source 
#KT-492 In Progress

For Byte, Char and Short explicit casting from Int is removed -- loop parameter
is already stored in an Int anyway. For Int and Long comparison "i < end" at
the beginning of the loop is replaced to "i != end" at the end of the loop + a
special check for an empty loop
This commit is contained in:
Alexander Udalov
2013-06-17 21:47:41 +04:00
parent f1a6d27d35
commit 33d6347876
10 changed files with 561 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = (MaxI - 2)..MaxI
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MaxI - 2, MaxI - 1, MaxI)) {
return "Wrong elements for (MaxI - 2)..MaxI: $list1"
}
val list2 = ArrayList<Byte>()
val range2 = (MaxB - 2).toByte()..MaxB
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Byte>((MaxB - 2).toByte(), (MaxB - 1).toByte(), MaxB)) {
return "Wrong elements for (MaxB - 2).toByte()..MaxB: $list2"
}
val list3 = ArrayList<Short>()
val range3 = (MaxS - 2).toShort()..MaxS
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Short>((MaxS - 2).toShort(), (MaxS - 1).toShort(), MaxS)) {
return "Wrong elements for (MaxS - 2).toShort()..MaxS: $list3"
}
val list4 = ArrayList<Long>()
val range4 = (MaxL - 2).toLong()..MaxL
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>((MaxL - 2).toLong(), (MaxL - 1).toLong(), MaxL)) {
return "Wrong elements for (MaxL - 2).toLong()..MaxL: $list4"
}
val list5 = ArrayList<Char>()
val range5 = (MaxC - 2).toChar()..MaxC
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 2).toChar(), (MaxC - 1).toChar(), MaxC)) {
return "Wrong elements for (MaxC - 2).toChar()..MaxC: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = MaxI..MaxI
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MaxI)) {
return "Wrong elements for MaxI..MaxI: $list1"
}
val list2 = ArrayList<Byte>()
val range2 = MaxB..MaxB
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Byte>(MaxB)) {
return "Wrong elements for MaxB..MaxB: $list2"
}
val list3 = ArrayList<Short>()
val range3 = MaxS..MaxS
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Short>(MaxS)) {
return "Wrong elements for MaxS..MaxS: $list3"
}
val list4 = ArrayList<Long>()
val range4 = MaxL..MaxL
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>(MaxL)) {
return "Wrong elements for MaxL..MaxL: $list4"
}
val list5 = ArrayList<Char>()
val range5 = MaxC..MaxC
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>(MaxC)) {
return "Wrong elements for MaxC..MaxC: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = MaxI..MinI
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>()) {
return "Wrong elements for MaxI..MinI: $list1"
}
val list2 = ArrayList<Byte>()
val range2 = MaxB..MinB
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Byte>()) {
return "Wrong elements for MaxB..MinB: $list2"
}
val list3 = ArrayList<Short>()
val range3 = MaxS..MinS
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Short>()) {
return "Wrong elements for MaxS..MinS: $list3"
}
val list4 = ArrayList<Long>()
val range4 = MaxL..MinL
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>()) {
return "Wrong elements for MaxL..MinL: $list4"
}
val list5 = ArrayList<Char>()
val range5 = MaxC..MinC
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>()) {
return "Wrong elements for MaxC..MinC: $list5"
}
return "OK"
}