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

Extension contains for ranges: rename parameter item to value.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-27 18:02:41 +03:00
parent b4256f0c89
commit f7a780f32c
2 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-gen/src/templates/Ranges.kt
+6 -6
View File
@@ -238,7 +238,7 @@ fun ranges(): List<GenericFunction> {
templates addAll integralPermutations.map { until(it.first, it.second) }
templates addAll listOf(PrimitiveType.Byte, PrimitiveType.Short).permutations().map { untilDeprecated(it.first, it.second) }
fun containsDeprecated(rangeType: PrimitiveType, itemType: PrimitiveType) = f("contains(item: $itemType)") {
fun containsDeprecated(rangeType: PrimitiveType, itemType: PrimitiveType) = f("contains(value: $itemType)") {
operator(true)
deprecate("Range<T> is deprecated. Use ClosedRange<T> instead.")
@@ -248,11 +248,11 @@ fun ranges(): List<GenericFunction> {
onlyPrimitives(Ranges, rangeType)
platformName("${rangeType.name.decapitalize()}RangeContains")
returns("Boolean")
doc { "Checks if the specified [item] belongs to this range." }
body { "return start <= item && item <= end" }
doc { "Checks if the specified [value] belongs to this range." }
body { "return start <= value && value <= end" }
}
fun contains(rangeType: PrimitiveType, itemType: PrimitiveType) = f("contains(item: $itemType)") {
fun contains(rangeType: PrimitiveType, itemType: PrimitiveType) = f("contains(value: $itemType)") {
operator(true)
check(rangeType.isNumeric() == itemType.isNumeric()) { "Required rangeType and itemType both to be numeric or both not, got: $rangeType, $itemType" }
@@ -261,8 +261,8 @@ fun ranges(): List<GenericFunction> {
customReceiver("ClosedRange<T>")
platformName("${rangeType.name.decapitalize()}RangeContains")
returns("Boolean")
doc { "Checks if the specified [item] belongs to this range." }
body { "return start <= item && item <= endInclusive" }
doc { "Checks if the specified [value] belongs to this range." }
body { "return start <= value && value <= endInclusive" }
}