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

Using empty ranges in downTo generator.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-08-09 13:56:56 +04:00
parent 543ec16f4d
commit 8084876fed
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/DownTo.kt
+25 -25
View File
@@ -7,23 +7,23 @@ package kotlin
public inline fun Byte.downTo(to: Byte): ByteRange {
return if (this >= to) ByteRange(this, to - this - 1) else ByteRange(0, 0)
return if (this >= to) ByteRange(this, to - this - 1) else ByteRange.EMPTY
}
public inline fun Byte.downTo(to: Char): CharRange {
return if (this >= to) CharRange(this.toChar(), to - this - 1) else CharRange(0.toChar(), 0)
return if (this >= to) CharRange(this.toChar(), to - this - 1) else CharRange.EMPTY
}
public inline fun Byte.downTo(to: Short): ShortRange {
return if (this >= to) ShortRange(this.toShort(), to - this - 1) else ShortRange(0, 0)
return if (this >= to) ShortRange(this.toShort(), to - this - 1) else ShortRange.EMPTY
}
public inline fun Byte.downTo(to: Int): IntRange {
return if (this >= to) IntRange(this.toInt(), to - this - 1) else IntRange(0, 0)
return if (this >= to) IntRange(this.toInt(), to - this - 1) else IntRange.EMPTY
}
public inline fun Byte.downTo(to: Long): LongRange {
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange.EMPTY
}
public inline fun Byte.downTo(to: Float): FloatRange {
@@ -35,23 +35,23 @@ public inline fun Byte.downTo(to: Double): DoubleRange {
}
public inline fun Char.downTo(to: Byte): CharRange {
return if (this >= to) CharRange(this, to - this - 1) else CharRange(0.toChar(), 0)
return if (this >= to) CharRange(this, to - this - 1) else CharRange.EMPTY
}
public inline fun Char.downTo(to: Char): CharRange {
return if (this >= to) CharRange(this, to - this - 1) else CharRange(0.toChar(), 0)
return if (this >= to) CharRange(this, to - this - 1) else CharRange.EMPTY
}
public inline fun Char.downTo(to: Short): ShortRange {
return if (this >= to) ShortRange(this.toShort(), to - this - 1) else ShortRange(0, 0)
return if (this >= to) ShortRange(this.toShort(), to - this - 1) else ShortRange.EMPTY
}
public inline fun Char.downTo(to: Int): IntRange {
return if (this >= to) IntRange(this.toInt(), to - this - 1) else IntRange(0, 0)
return if (this >= to) IntRange(this.toInt(), to - this - 1) else IntRange.EMPTY
}
public inline fun Char.downTo(to: Long): LongRange {
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange.EMPTY
}
public inline fun Char.downTo(to: Float): FloatRange {
@@ -63,23 +63,23 @@ public inline fun Char.downTo(to: Double): DoubleRange {
}
public inline fun Short.downTo(to: Byte): ShortRange {
return if (this >= to) ShortRange(this, to - this - 1) else ShortRange(0, 0)
return if (this >= to) ShortRange(this, to - this - 1) else ShortRange.EMPTY
}
public inline fun Short.downTo(to: Char): ShortRange {
return if (this >= to) ShortRange(this, to - this - 1) else ShortRange(0, 0)
return if (this >= to) ShortRange(this, to - this - 1) else ShortRange.EMPTY
}
public inline fun Short.downTo(to: Short): ShortRange {
return if (this >= to) ShortRange(this, to - this - 1) else ShortRange(0, 0)
return if (this >= to) ShortRange(this, to - this - 1) else ShortRange.EMPTY
}
public inline fun Short.downTo(to: Int): IntRange {
return if (this >= to) IntRange(this.toInt(), to - this - 1) else IntRange(0, 0)
return if (this >= to) IntRange(this.toInt(), to - this - 1) else IntRange.EMPTY
}
public inline fun Short.downTo(to: Long): LongRange {
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange.EMPTY
}
public inline fun Short.downTo(to: Float): FloatRange {
@@ -91,23 +91,23 @@ public inline fun Short.downTo(to: Double): DoubleRange {
}
public inline fun Int.downTo(to: Byte): IntRange {
return if (this >= to) IntRange(this, to - this - 1) else IntRange(0, 0)
return if (this >= to) IntRange(this, to - this - 1) else IntRange.EMPTY
}
public inline fun Int.downTo(to: Char): IntRange {
return if (this >= to) IntRange(this, to - this - 1) else IntRange(0, 0)
return if (this >= to) IntRange(this, to - this - 1) else IntRange.EMPTY
}
public inline fun Int.downTo(to: Short): IntRange {
return if (this >= to) IntRange(this, to - this - 1) else IntRange(0, 0)
return if (this >= to) IntRange(this, to - this - 1) else IntRange.EMPTY
}
public inline fun Int.downTo(to: Int): IntRange {
return if (this >= to) IntRange(this, to - this - 1) else IntRange(0, 0)
return if (this >= to) IntRange(this, to - this - 1) else IntRange.EMPTY
}
public inline fun Int.downTo(to: Long): LongRange {
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this.toLong(), to - this - 1) else LongRange.EMPTY
}
public inline fun Int.downTo(to: Float): FloatRange {
@@ -119,23 +119,23 @@ public inline fun Int.downTo(to: Double): DoubleRange {
}
public inline fun Long.downTo(to: Byte): LongRange {
return if (this >= to) LongRange(this, to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this, to - this - 1) else LongRange.EMPTY
}
public inline fun Long.downTo(to: Char): LongRange {
return if (this >= to) LongRange(this, to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this, to - this - 1) else LongRange.EMPTY
}
public inline fun Long.downTo(to: Short): LongRange {
return if (this >= to) LongRange(this, to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this, to - this - 1) else LongRange.EMPTY
}
public inline fun Long.downTo(to: Int): LongRange {
return if (this >= to) LongRange(this, to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this, to - this - 1) else LongRange.EMPTY
}
public inline fun Long.downTo(to: Long): LongRange {
return if (this >= to) LongRange(this, to - this - 1) else LongRange(0, 0)
return if (this >= to) LongRange(this, to - this - 1) else LongRange.EMPTY
}
public inline fun Long.downTo(to: Float): FloatRange {
libraries/stdlib/test/org/jetbrains/kotlin/tools/GenerateDownTos.kt
+1 -2
View File
@@ -28,10 +28,9 @@ public inline fun $fromType.downTo(to: $toType): $rangeType {
return $rangeType($fromExpr, to - this)
}""")
} else {
// TODO use empty range constant, which is not available yet (KT-2583)
writer.println("""
public inline fun $fromType.downTo(to: $toType): $rangeType {
return if (this >= to) $rangeType($fromExpr, to - this - 1) else $rangeType(${if (elementType == "Char") "0.toChar()" else "0"}, 0)
return if (this >= to) $rangeType($fromExpr, to - this - 1) else $rangeType.EMPTY
}""")
}
}