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

Changed usages of upto/downto in test to rangeTo and downTo, respectively.

Browse Source 
#KT-2519 in progress
This commit is contained in:
Evgeny Gerashchenko
2012-08-07 22:07:14 +04:00
parent 662fdca034
commit a4031225d0
11 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/regressions/kt1076.kt
+1 -1
View File
@@ -1,6 +1,6 @@
fun box() : String {
var cnt = 0
for (len in 4 downto 1) {
for (len in 4 downTo 1) {
cnt++
}
compiler/testData/codegen/regressions/kt930.kt
+38 -38
View File
@@ -1,82 +1,82 @@
fun testInt () : String {
val r1 = 1 upto 4
if(r1.end != 4 || r1.isReversed || r1.size != 4) return "int upto fail"
val r1 = 1 rangeTo 4
if(r1.end != 4 || r1.isReversed || r1.size != 4) return "int rangeTo fail"
val r2 = 4 upto 1
if(r2.start != 0 || r2.size != 0) return "int negative upto fail"
val r2 = 4 rangeTo 1
if(r2.start != 0 || r2.size != 0) return "int negative rangeTo fail"
val r3 = 5 downto 0
if(r3.start != 5 || r3.end != 0 || !r3.isReversed || r3.size != 6) return "int downto fail"
val r3 = 5 downTo 0
if(r3.start != 5 || r3.end != 0 || !r3.isReversed || r3.size != 6) return "int downTo fail"
val r4 = 5 downto 6
if(r4.start != 0 || r4.end != 0 || !r3.isReversed || r4.size != 0) return "int negative downto fail"
val r4 = 5 downTo 6
if(r4.start != 0 || r4.end != 0 || !r3.isReversed || r4.size != 0) return "int negative downTo fail"
return "OK"
}
fun testByte () : String {
val r1 = 1.toByte() upto 4.toByte()
if(r1.end != 4.toByte() || r1.isReversed || r1.size != 4) return "byte upto fail"
val r1 = 1.toByte() rangeTo 4.toByte()
if(r1.end != 4.toByte() || r1.isReversed || r1.size != 4) return "byte rangeTo fail"
val r2 = 4.toByte() upto 1.toByte()
if(r2.start != 0.toByte() || r2.size != 0) return "byte negative upto fail"
val r2 = 4.toByte() rangeTo 1.toByte()
if(r2.start != 0.toByte() || r2.size != 0) return "byte negative rangeTo fail"
val r3 = 5.toByte() downto 0.toByte()
if(r3.start != 5.toByte() || r3.end != 0.toByte() || !r3.isReversed || r3.size != 6) return "byte downto fail"
val r3 = 5.toByte() downTo 0.toByte()
if(r3.start != 5.toByte() || r3.end != 0.toByte() || !r3.isReversed || r3.size != 6) return "byte downTo fail"
val r4 = 5.toByte() downto 6.toByte()
if(r4.start != 0.toByte() || r4.end != 0.toByte() || !r3.isReversed || r4.size != 0) return "byte negative downto fail"
val r4 = 5.toByte() downTo 6.toByte()
if(r4.start != 0.toByte() || r4.end != 0.toByte() || !r3.isReversed || r4.size != 0) return "byte negative downTo fail"
return "OK"
}
fun testShort () : String {
val r1 = 1.toShort() upto 4.toShort()
if(r1.end != 4.toShort() || r1.isReversed || r1.size != 4) return "short upto fail"
val r1 = 1.toShort() rangeTo 4.toShort()
if(r1.end != 4.toShort() || r1.isReversed || r1.size != 4) return "short rangeTo fail"
val r2 = 4.toShort() upto 1.toShort()
if(r2.start != 0.toShort() || r2.size != 0) return "short negative upto fail"
val r2 = 4.toShort() rangeTo 1.toShort()
if(r2.start != 0.toShort() || r2.size != 0) return "short negative rangeTo fail"
val r3 = 5.toShort() downto 0.toShort()
if(r3.start != 5.toShort() || r3.end != 0.toShort() || !r3.isReversed || r3.size != 6) return "short downto fail"
val r3 = 5.toShort() downTo 0.toShort()
if(r3.start != 5.toShort() || r3.end != 0.toShort() || !r3.isReversed || r3.size != 6) return "short downTo fail"
val r4 = 5.toShort() downto 6.toShort()
if(r4.start != 0.toShort() || r4.end != 0.toShort() || !r3.isReversed || r4.size != 0) return "short negative downto fail"
val r4 = 5.toShort() downTo 6.toShort()
if(r4.start != 0.toShort() || r4.end != 0.toShort() || !r3.isReversed || r4.size != 0) return "short negative downTo fail"
return "OK"
}
fun testLong () : String {
val r1 = 1.toLong() upto 4.toLong()
if(r1.end != 4.toLong() || r1.isReversed || r1.size != 4.toLong()) return "long upto fail"
val r1 = 1.toLong() rangeTo 4.toLong()
if(r1.end != 4.toLong() || r1.isReversed || r1.size != 4.toLong()) return "long rangeTo fail"
val r2 = 4.toLong() upto 1.toLong()
val r2 = 4.toLong() rangeTo 1.toLong()
if(r2.start != 0.toLong() || r2.size != 0.toLong()) return "short negative long fail"
val r3 = 5.toLong() downto 0.toLong()
if(r3.start != 5.toLong() || r3.end != 0.toLong() || !r3.isReversed || r3.size != 6.toLong()) return "long downto fail"
val r3 = 5.toLong() downTo 0.toLong()
if(r3.start != 5.toLong() || r3.end != 0.toLong() || !r3.isReversed || r3.size != 6.toLong()) return "long downTo fail"
val r4 = 5.toLong() downto 6.toLong()
if(r4.start != 0.toLong() || r4.end != 0.toLong() || !r3.isReversed || r4.size != 0.toLong()) return "long negative downto fail"
val r4 = 5.toLong() downTo 6.toLong()
if(r4.start != 0.toLong() || r4.end != 0.toLong() || !r3.isReversed || r4.size != 0.toLong()) return "long negative downTo fail"
return "OK"
}
fun testChar () : String {
val r1 = 'a' upto 'd'
if(r1.end != 'd' || r1.isReversed || r1.size != 4) return "char upto fail"
val r1 = 'a' rangeTo 'd'
if(r1.end != 'd' || r1.isReversed || r1.size != 4) return "char rangeTo fail"
val r2 = 'd' upto 'a'
val r2 = 'd' rangeTo 'a'
if(r2.start != 0.toChar() || r2.size != 0) return "char negative long fail"
val r3 = 'd' downto 'a'
if(r3.start != 'd' || r3.end != 'a' || !r3.isReversed || r3.size != 4) return "char downto fail"
val r3 = 'd' downTo 'a'
if(r3.start != 'd' || r3.end != 'a' || !r3.isReversed || r3.size != 4) return "char downTo fail"
val r4 = 'a' downto 'd'
if(r4.start != 0.toChar() || r4.end != 0.toChar() || !r3.isReversed || r4.size != 0) return "char negative downto fail"
val r4 = 'a' downTo 'd'
if(r4.start != 0.toChar() || r4.end != 0.toChar() || !r3.isReversed || r4.size != 0) return "char negative downTo fail"
return "OK"
}
compiler/testData/codegen/uptoDownto.kt
+2 -2
View File
@@ -21,12 +21,12 @@ fun box(): String {
}
sb.append(";")
for (i in 0 downto 0) {
for (i in 0 downTo 0) {
ap(i)
}
sb.append(";")
for (i in 1 downto 0) {
for (i in 1 downTo 0) {
ap(i)
}
compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
+1 -1
View File
@@ -313,7 +313,7 @@ public class ControlStructuresTest extends CodegenTestCase {
}
public void testKt1076() throws Exception {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL);
blackBoxFile("regressions/kt1076.kt");
}
compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
-4
View File
@@ -401,10 +401,6 @@ public class PrimitiveTypesTest extends CodegenTestCase {
blackBoxFile("regressions/kt765.kt");
}
public void testKt930 () {
blackBoxFile("regressions/kt930.kt");
}
public void testKt944 () {
blackBoxFile("regressions/kt944.kt");
}
compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
+4
View File
@@ -345,6 +345,10 @@ public class StdlibTest extends CodegenTestCase {
blackBoxFile("uptoDownto.kt");
}
public void testKt930 () {
blackBoxFile("regressions/kt930.kt");
}
public void test1733() {
blackBoxFile("regressions/kt1733.kt");
}
js/js.libraries/src/core/javautilCode.kt
+1 -1
View File
@@ -29,7 +29,7 @@ public object Collections {
public fun <T> reverse(list: List<T>): Unit {
val size = list.size()
for (i in 0.upto(size / 2)) {
for (i in 0.rangeTo(size / 2)) {
val i2 = size - i
val tmp = list[i]
list[i] = list[i2]
js/js.libraries/src/stdlib/jutilCode.kt
+1 -1
View File
@@ -10,7 +10,7 @@ public inline fun <T> java.util.List<T>.equals(that: List<T>): Boolean {
val s1 = this.size()
val s2 = that.size()
if (s1 == s2) {
for (i in 0.upto(s1)) {
for (i in 0.rangeTo(s1)) {
val elem1 = this.get(i)
val elem2 = that.get(i)
if (elem1 != elem2) {
js/js.translator/testFiles/range/cases/intUpTo.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import java.util.ArrayList
fun box() : Boolean {
var elems = ArrayList<Int>()
for (i in 0 upto 5) {
for (i in 0 rangeTo 5) {
elems.add(i)
}
return elems[0] == 0 && elems[1] == 1 && elems[2] == 2 && elems[3] == 3 && elems[4] == 4 && elems[5] == 5
js/js.translator/testFiles/range/cases/upToDoesNotIterate.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package foo
import java.util.ArrayList
fun box() : Boolean {
for (i in 0 upto -1) {
for (i in 0 upTo -1) {
return false
}
return true
libraries/stdlib/test/language/RangeTest.kt
+2 -2
View File
@@ -5,7 +5,7 @@ import kotlin.test.*
class RangeTest {
test fun upRange() {
val range = 0.upto(9)
val range = 0.rangeTo(9)
println("Have created up range: $range")
assertEquals(10, range.size)
assertTrue(range.contains(0))
@@ -15,7 +15,7 @@ class RangeTest {
}
test fun downRange() {
val range = 9.downto(0)
val range = 9.downTo(0)
println("Have created down range: $range")
assertEquals(10, range.size)
assertTrue(range.contains(0))