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

Eliminate byte and short ranges and progressions from range construction functions' return type.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-29 17:40:29 +03:00
parent 9eb5ba910c
commit 854d376988
4 changed files with 121 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-gen/src/templates/Ranges.kt
+17 -7
View File
@@ -1,13 +1,19 @@
package templates
import templates.Family.*
import templates.PrimitiveType.Companion.maxByCapacity
fun ranges(): List<GenericFunction> {
val templates = arrayListOf<GenericFunction>()
val rangePrimitives = listOf(PrimitiveType.Int, PrimitiveType.Long, PrimitiveType.Char)
fun rangeElementType(fromType: PrimitiveType, toType: PrimitiveType)
= maxByCapacity(fromType, toType).let { if (it == PrimitiveType.Char) it else maxByCapacity(it, PrimitiveType.Int) }
templates add f("reversed()") {
only(RangesOfPrimitives, ProgressionsOfPrimitives)
only(PrimitiveType.integralPrimitives)
only(rangePrimitives)
doc(ProgressionsOfPrimitives) { "Returns a progression that goes over the same range in the opposite direction with the same step." }
doc(RangesOfPrimitives) { "Returns a progression that goes over this range in reverse direction." }
returns("TProgression")
@@ -21,7 +27,7 @@ fun ranges(): List<GenericFunction> {
templates add f("reversed()") {
only(RangesOfPrimitives, ProgressionsOfPrimitives)
only(defaultPrimitives - PrimitiveType.Boolean - PrimitiveType.integralPrimitives)
only(defaultPrimitives - PrimitiveType.Boolean - rangePrimitives)
doc(ProgressionsOfPrimitives) { "Returns a progression that goes over the same range in the opposite direction with the same step." }
doc(RangesOfPrimitives) { "Returns a progression that goes over this range in reverse direction." }
returns("TProgression")
@@ -39,7 +45,7 @@ fun ranges(): List<GenericFunction> {
infix(true)
only(RangesOfPrimitives, ProgressionsOfPrimitives)
only(PrimitiveType.integralPrimitives)
only(rangePrimitives)
doc(ProgressionsOfPrimitives) { "Returns a progression that goes over the same range with the given step." }
doc(RangesOfPrimitives) { "Returns a progression that goes over this range with given step." }
returns("TProgression")
@@ -61,7 +67,7 @@ fun ranges(): List<GenericFunction> {
infix(true)
only(RangesOfPrimitives, ProgressionsOfPrimitives)
only(defaultPrimitives - PrimitiveType.Boolean - PrimitiveType.integralPrimitives)
only(defaultPrimitives - PrimitiveType.Boolean - rangePrimitives)
doc(ProgressionsOfPrimitives) { "Returns a progression that goes over the same range with the given step." }
doc(RangesOfPrimitives) { "Returns a progression that goes over this range with given step." }
returns("TProgression")
@@ -88,13 +94,14 @@ fun ranges(): List<GenericFunction> {
}
}
fun downTo(fromType: PrimitiveType, toType: PrimitiveType) = f("downTo(to: $toType)") {
infix(true)
sourceFile(SourceFile.Ranges)
only(Primitives)
only(fromType)
val elementType = PrimitiveType.maxByCapacity(fromType, toType)
val elementType = rangeElementType(fromType, toType)
val progressionType = elementType.name + "Progression"
returns(progressionType)
@@ -134,7 +141,7 @@ fun ranges(): List<GenericFunction> {
sourceFile(SourceFile.Ranges)
only(Primitives)
only(fromType)
val elementType = PrimitiveType.maxByCapacity(fromType, toType)
val elementType = rangeElementType(fromType, toType)
val progressionType = elementType.name + "Range"
returns(progressionType)
@@ -182,8 +189,11 @@ fun ranges(): List<GenericFunction> {
deprecate(Deprecation("This range implementation has unclear semantics and will be removed soon.", level = DeprecationLevel.WARNING))
annotations("""@Suppress("DEPRECATION_ERROR")""")
}
else if (rangeType !in rangePrimitives) {
deprecate(Deprecation("This range will be removed soon.", level = DeprecationLevel.WARNING))
}
check(rangeType.isNumeric() == itemType.isNumeric()) { "Require rangeType and itemType both be numeric or both not, got: $rangeType, $itemType" }
check(rangeType.isNumeric() == itemType.isNumeric()) { "Required rangeType and itemType both to be numeric or both not, got: $rangeType, $itemType" }
only(Ranges)
onlyPrimitives(Ranges, rangeType)
platformName("${rangeType.name.decapitalize()}RangeContains")