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

fixing stupid bug introduced in previous commit

Browse Source 
simplification of api
This commit is contained in:
Alex Tkachman
2012-01-06 14:22:02 +02:00
parent 1d2e237312
commit 22afbed909
8 changed files with 50 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/jet/Library.jet
+15 -5
View File
@@ -256,7 +256,7 @@ trait Range<in T : Comparable<T>> {
fun contains(item : T) : Boolean
}
class IntRange(val start : Int, val size : Int, val isReversed : Boolean = false) : Range<Int>, IntIterable {
class IntRange(val start : Int, val size : Int) : Range<Int>, IntIterable {
fun iterator () : IntIterator
fun contains (elem: Int) : Boolean
@@ -266,9 +266,11 @@ class IntRange(val start : Int, val size : Int, val isReversed : Boolean = false
fun minus() : IntRange
fun step(step: Int) : IntIterator
val isReversed : Boolean
}
class LongRange(val start : Long, val size : Long, val isReversed : Boolean = false) : Range<Long>, LongIterable {
class LongRange(val start : Long, val size : Long) : Range<Long>, LongIterable {
fun iterator () : LongIterator
fun contains (elem: Long) : Boolean
@@ -278,9 +280,11 @@ class LongRange(val start : Long, val size : Long, val isReversed : Boolean = fa
fun minus() : LongRange
fun step(step: Long) : LongIterator
val isReversed : Boolean
}
class ByteRange(val start : Byte, val size : Int, val isReversed : Boolean = false) : Range<Byte>, ByteIterable {
class ByteRange(val start : Byte, val size : Int) : Range<Byte>, ByteIterable {
fun iterator () : ByteIterator
fun contains (elem: Byte) : Boolean
@@ -290,9 +294,11 @@ class ByteRange(val start : Byte, val size : Int, val isReversed : Boolean = fal
fun minus() : ByteRange
fun step(step: Int) : ByteIterator
val isReversed : Boolean
}
class ShortRange(val start : Short, val size : Int, val isReversed : Boolean = false) : Range<Short>, ShortIterable {
class ShortRange(val start : Short, val size : Int) : Range<Short>, ShortIterable {
fun iterator () : ShortIterator
fun contains (elem: Byte) : Boolean
@@ -302,9 +308,11 @@ class ShortRange(val start : Short, val size : Int, val isReversed : Boolean = f
fun minus() : ShortRange
fun step(step: Int) : ShortIterator
val isReversed : Boolean
}
class CharRange(val start : Char, val size : Int, val isReversed : Boolean = false) : Range<Char>, CharIterable {
class CharRange(val start : Char, val size : Int) : Range<Char>, CharIterable {
fun iterator () : CharIterator
fun contains (elem: Char) : Boolean
@@ -314,6 +322,8 @@ class CharRange(val start : Char, val size : Int, val isReversed : Boolean = fal
fun minus() : CharRange
fun step(step: Int) : CharIterator
val isReversed : Boolean
}
abstract class Number : Hashable {
compiler/testData/codegen/regressions/kt821.kt
-12
View File
@@ -2,9 +2,6 @@ fun box() : String {
val r1 = IntRange(1, 4)
if(r1.end != 4 || r1.isReversed || r1.size != 4) return "fail"
val r2 = IntRange(1, 4, true)
if(r2.end != -2 || !r2.isReversed || r2.size != 4) return "fail"
val r3 = -(0..5)
if(r3.start != 5 || r3.end != 0 || !r3.isReversed || r3.size != 6) return "fail"
@@ -14,9 +11,6 @@ fun box() : String {
val r5 = ByteRange(1, 4)
if(r5.end != 4.byt || r5.isReversed || r5.size != 4) return "fail"
val r6 = ByteRange(1, 4, true)
if(r6.end != -2.byt || !r6.isReversed) return "fail"
val r7 = -(0.byt..5.byt)
if(r7.start != 5.byt || r7.end != 0.byt || !r7.isReversed) return "fail"
@@ -26,9 +20,6 @@ fun box() : String {
val r10 = ShortRange(1, 4)
if(r10.end != 4.sht || r10.isReversed || r10.size != 4) return "fail"
val r11 = ShortRange(1, 4, true)
if(r11.end != -2.sht || !r11.isReversed) return "fail"
val r12 = -(0.sht..5.sht)
if(r12.start != 5.sht || r12.end != 0.sht || !r12.isReversed) return "fail"
@@ -38,9 +29,6 @@ fun box() : String {
val r14 = CharRange('a', 4)
if(r14.end != 'd' || r14.isReversed || r14.size != 4) return "fail"
val r15 = CharRange('D', 4, true)
if(r15.end != 'A' || !r15.isReversed) return "fail"
val r16 = -('a'..'e')
if(r16.start != 'e' || r16.end != 'a' || !r16.isReversed) return "fail"