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

Adapted code to new structure of ranges.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-01-24 00:03:37 +04:00
parent 9fa3e47b65
commit b2e74b1473
6 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/primitiveTypes/kt821.kt
+8 -8
View File
@@ -1,24 +1,24 @@
fun box() : String { fun box() : String {
val r1 = IntRange(1, 4) val r1 = IntRange(1, 4)
if(r1.end != 4 || r1.size != 4) return "fail" if(r1.start != 1 || r1.end != 4) return "fail"
val r2 = ByteRange(1, 4) val r2 = ByteRange(1, 4)
if(r2.end != 4.toByte() || r2.size != 4) return "fail" if(r2.start != 1.toByte() || r2.end != 4.toByte()) return "fail"
val r3 = ShortRange(1, 4) val r3 = ShortRange(1, 4)
if(r3.end != 4.toShort() || r3.size != 4) return "fail" if(r3.start != 1.toShort() || r3.end != 4.toShort()) return "fail"
val r4 = CharRange('a', 4) val r4 = CharRange('a', 'd')
if(r4.end != 'd' || r4.size != 4) return "fail" if(r4.start != 'a' || r4.end != 'd') return "fail"
val r5 = FloatRange(0.0.toFloat(), 1.0.toFloat()) val r5 = FloatRange(0.0.toFloat(), 1.0.toFloat())
if(r5.end != 1.0.toFloat() || r5.size != 1.0.toFloat()) return "fail" if(r5.start != 0.0.toFloat() || r5.end != 1.0.toFloat()) return "fail"
val r6 = DoubleRange(0.0, 1.0) val r6 = DoubleRange(0.0, 1.0)
if(r6.end != 1.0 || r6.size != 1.0) return "fail" if(r6.start != 0.0 || r6.end != 1.0) return "fail"
val r7 = LongRange(1, 4) val r7 = LongRange(1, 4)
if(r7.end != 4.toLong() || r7.size != 4.toLong()) return "fail" if(r7.start != 1.toLong() || r7.end != 4.toLong()) return "fail"
return "OK" return "OK"
} }
compiler/testData/codegen/regressions/kt930.kt
+20 -20
View File
@@ -1,31 +1,31 @@
fun testInt () : String { fun testInt () : String {
val r1 = 1 rangeTo 4 val r1 = 1 rangeTo 4
if(r1.end != 4 || r1.size != 4) return "int rangeTo fail" if (r1.start != 1 || r1.end != 4) return "int rangeTo fail"
val r2 = 4 rangeTo 1 val r2 = 4 rangeTo 1
if(r2.start != 0 || r2.size != 0) return "int negative rangeTo fail" if (r2.start != 4 || r2.end != 1) return "int negative rangeTo fail"
val r3 = 5 downTo 0 val r3 = 5 downTo 0
if(r3.start != 5 || r3.end != 0 || r3.size != 6) return "int downTo fail" if (r3.start != 5 || r3.end != 0 || r3.increment != -1) return "int downTo fail"
val r4 = 5 downTo 6 val r4 = 5 downTo 6
if(r4.start != 0 || r4.end != 0 || r4.size != 0) return "int negative downTo fail" if (r4.start != 5 || r4.end != 6 || r4.increment != -1) return "int negative downTo fail"
return "OK" return "OK"
} }
fun testByte () : String { fun testByte () : String {
val r1 = 1.toByte() rangeTo 4.toByte() val r1 = 1.toByte() rangeTo 4.toByte()
if(r1.end != 4.toByte() || r1.size != 4) return "byte rangeTo fail" if (r1.start != 1.toByte() || r1.end != 4.toByte()) return "byte rangeTo fail"
val r2 = 4.toByte() rangeTo 1.toByte() val r2 = 4.toByte() rangeTo 1.toByte()
if(r2.start != 0.toByte() || r2.size != 0) return "byte negative rangeTo fail" if (r2.start != 4.toByte() || r2.end != 1.toByte()) return "byte negative rangeTo fail"
val r3 = 5.toByte() downTo 0.toByte() val r3 = 5.toByte() downTo 0.toByte()
if(r3.start != 5.toByte() || r3.end != 0.toByte() || r3.size != 6) return "byte downTo fail" if (r3.start != 5.toByte() || r3.end != 0.toByte() || r3.increment != -1) return "byte downTo fail"
val r4 = 5.toByte() downTo 6.toByte() val r4 = 5.toByte() downTo 6.toByte()
if(r4.start != 0.toByte() || r4.end != 0.toByte() || r4.size != 0) return "byte negative downTo fail" if (r3.start != 5.toByte() || r3.end != 0.toByte() || r4.increment != -1) return "byte negative downTo fail"
return "OK" return "OK"
} }
@@ -33,16 +33,16 @@ fun testByte () : String {
fun testShort () : String { fun testShort () : String {
val r1 = 1.toShort() rangeTo 4.toShort() val r1 = 1.toShort() rangeTo 4.toShort()
if(r1.end != 4.toShort() || r1.size != 4) return "short rangeTo fail" if (r1.start != 1.toShort() || r1.end != 4.toShort()) return "short rangeTo fail"
val r2 = 4.toShort() rangeTo 1.toShort() val r2 = 4.toShort() rangeTo 1.toShort()
if(r2.start != 0.toShort() || r2.size != 0) return "short negative rangeTo fail" if (r2.start != 4.toShort() || r2.end != 1.toShort()) return "short negative rangeTo fail"
val r3 = 5.toShort() downTo 0.toShort() val r3 = 5.toShort() downTo 0.toShort()
if(r3.start != 5.toShort() || r3.end != 0.toShort() || r3.size != 6) return "short downTo fail" if (r3.start != 5.toShort() || r3.end != 0.toShort() || r3.increment != -1) return "short downTo fail"
val r4 = 5.toShort() downTo 6.toShort() val r4 = 5.toShort() downTo 6.toShort()
if(r4.start != 0.toShort() || r4.end != 0.toShort() || r4.size != 0) return "short negative downTo fail" if (r3.start != 5.toShort() || r3.end != 0.toShort() || r4.increment != -1) return "short negative downTo fail"
return "OK" return "OK"
} }
@@ -50,16 +50,16 @@ fun testShort () : String {
fun testLong () : String { fun testLong () : String {
val r1 = 1.toLong() rangeTo 4.toLong() val r1 = 1.toLong() rangeTo 4.toLong()
if(r1.end != 4.toLong() || r1.size != 4.toLong()) return "long rangeTo fail" if (r1.start != 1.toLong() || r1.end != 4.toLong()) return "long rangeTo fail"
val r2 = 4.toLong() rangeTo 1.toLong() val r2 = 4.toLong() rangeTo 1.toLong()
if(r2.start != 0.toLong() || r2.size != 0.toLong()) return "short negative long fail" if (r2.start != 4.toLong() || r2.end != 1.toLong()) return "long negative rangeTo fail"
val r3 = 5.toLong() downTo 0.toLong() val r3 = 5.toLong() downTo 0.toLong()
if(r3.start != 5.toLong() || r3.end != 0.toLong() || r3.size != 6.toLong()) return "long downTo fail" if (r3.start != 5.toLong() || r3.end != 0.toLong() || r3.increment != -1.toLong()) return "long downTo fail"
val r4 = 5.toLong() downTo 6.toLong() val r4 = 5.toLong() downTo 6.toLong()
if(r4.start != 0.toLong() || r4.end != 0.toLong() || r4.size != 0.toLong()) return "long negative downTo fail" if (r3.start != 5.toLong() || r3.end != 0.toLong() || r4.increment != -1.toLong()) return "long negative downTo fail"
return "OK" return "OK"
} }
@@ -67,16 +67,16 @@ fun testLong () : String {
fun testChar () : String { fun testChar () : String {
val r1 = 'a' rangeTo 'd' val r1 = 'a' rangeTo 'd'
if(r1.end != 'd' || r1.size != 4) return "char rangeTo fail" if (r1.start != 'a' || r1.end != 'd') return "char rangeTo fail"
val r2 = 'd' rangeTo 'a' val r2 = 'd' rangeTo 'a'
if(r2.start != 0.toChar() || r2.size != 0) return "char negative long fail" if(r2.start != 'd' || r2.end != 'a') return "char negative long fail"
val r3 = 'd' downTo 'a' val r3 = 'd' downTo 'a'
if(r3.start != 'd' || r3.end != 'a' || r3.size != 4) return "char downTo fail" if (r3.start != 'd' || r3.end != 'a' || r3.increment != -1) return "char downTo fail"
val r4 = 'a' downTo 'd' val r4 = 'a' downTo 'd'
if(r4.start != 0.toChar() || r4.end != 0.toChar() || r4.size != 0) return "char negative downTo fail" if (r4.start != 'a' || r4.end != 'd' || r4.increment != -1) return "char negative downTo fail"
return "OK" return "OK"
} }
js/js.translator/testFiles/range/cases/explicitRange.kt
-1
View File
@@ -15,7 +15,6 @@ fun box() : Boolean {
if (!oneToFive.contains(3)) return false; if (!oneToFive.contains(3)) return false;
if (!oneToFive.contains(4)) return false; if (!oneToFive.contains(4)) return false;
if (!(oneToFive.start == 1)) return false; if (!(oneToFive.start == 1)) return false;
if (!(oneToFive.size == 4)) return false;
if (!(oneToFive.end == 4)) return false; if (!(oneToFive.end == 4)) return false;
var sum = 0; var sum = 0;
js/js.translator/testFiles/range/cases/rangeSugarSyntax.kt
-1
View File
@@ -15,7 +15,6 @@ fun box() : Boolean {
if (!oneToFive.contains(3)) return false; if (!oneToFive.contains(3)) return false;
if (!oneToFive.contains(4)) return false; if (!oneToFive.contains(4)) return false;
if (!(oneToFive.start == 1)) return false; if (!(oneToFive.start == 1)) return false;
if (!(oneToFive.size == 5)) return false;
if (!(oneToFive.end == 5)) return false; if (!(oneToFive.end == 5)) return false;
var sum = 0; var sum = 0;
libraries/stdlib/test/CollectionTest.kt
-1
View File
@@ -382,7 +382,6 @@ class CollectionTest {
val indices = data.indices val indices = data.indices
assertEquals(0, indices.start) assertEquals(0, indices.start)
assertEquals(1, indices.end) assertEquals(1, indices.end)
assertEquals(2, indices.size)
assertEquals(indices, data.size. indices) assertEquals(indices, data.size. indices)
} }
libraries/stdlib/test/language/RangeTest.kt
+2 -9
View File
@@ -7,7 +7,6 @@ class RangeTest {
test fun upRange() { test fun upRange() {
val range = 0.rangeTo(9) val range = 0.rangeTo(9)
println("Have created up range: $range") println("Have created up range: $range")
assertEquals(10, range.size)
assertTrue(range.contains(0)) assertTrue(range.contains(0))
assertTrue(range.contains(1)) assertTrue(range.contains(1))
assertTrue(range.contains(9)) assertTrue(range.contains(9))
@@ -17,7 +16,6 @@ class RangeTest {
test fun downRange() { test fun downRange() {
val range = 9.downTo(0) val range = 9.downTo(0)
println("Have created down range: $range") println("Have created down range: $range")
assertEquals(10, range.size)
assertTrue(range.contains(0)) assertTrue(range.contains(0))
assertTrue(range.contains(1)) assertTrue(range.contains(1))
assertTrue(range.contains(9)) assertTrue(range.contains(9))
@@ -27,19 +25,14 @@ class RangeTest {
test fun reversedRanges() { test fun reversedRanges() {
val intRange = 0..9 val intRange = 0..9
val reversedIntRange = intRange.reversed() val reversedIntRange = intRange.reversed()
assertEquals(10, reversedIntRange.size)
assertEquals(9, reversedIntRange.start) assertEquals(9, reversedIntRange.start)
assertEquals(0, reversedIntRange.end) assertEquals(0, reversedIntRange.end)
assertEquals(intRange, reversedIntRange.reversed()) assertEquals(intRange.toList(), reversedIntRange.reversed().toList())
val doubleRange = 0.0..9.0 val doubleRange = 0.0..9.0
val reversedDoubleRange = doubleRange.reversed() val reversedDoubleRange = doubleRange.reversed()
assertEquals(9.0, reversedDoubleRange.size)
assertEquals(9.0, reversedDoubleRange.start) assertEquals(9.0, reversedDoubleRange.start)
assertEquals(0.0, reversedDoubleRange.end) assertEquals(0.0, reversedDoubleRange.end)
assertEquals(doubleRange, reversedDoubleRange.reversed()) assertEquals(doubleRange.toList(), reversedDoubleRange.reversed().toList())
assertEquals(IntRange.EMPTY, IntRange.EMPTY.reversed())
assertEquals(FloatRange.EMPTY, FloatRange.EMPTY.reversed())
} }
} }