stdlib-gen, minor: rename property
This commit is contained in:
@@ -749,7 +749,7 @@ object Filtering : TemplateGroupBase() {
|
||||
typeParam("reified R")
|
||||
typeParam("C : MutableCollection<in R>")
|
||||
inline()
|
||||
receiverAsterisk = true
|
||||
genericStarProjection = true
|
||||
returns("C")
|
||||
body {
|
||||
"""
|
||||
@@ -766,7 +766,7 @@ object Filtering : TemplateGroupBase() {
|
||||
typeParam("reified R")
|
||||
returns("List<@kotlin.internal.NoInfer R>")
|
||||
inline()
|
||||
receiverAsterisk = true
|
||||
genericStarProjection = true
|
||||
body {
|
||||
"""
|
||||
return filterIsInstanceTo(ArrayList<R>())
|
||||
@@ -790,7 +790,7 @@ object Filtering : TemplateGroupBase() {
|
||||
include(Iterables, ArraysOfObjects, Sequences)
|
||||
} builder {
|
||||
doc { "Appends all elements that are instances of specified class to the given [destination]." }
|
||||
receiverAsterisk = true
|
||||
genericStarProjection = true
|
||||
typeParam("C : MutableCollection<in R>")
|
||||
typeParam("R")
|
||||
returns("C")
|
||||
@@ -808,7 +808,7 @@ object Filtering : TemplateGroupBase() {
|
||||
include(Iterables, ArraysOfObjects, Sequences)
|
||||
} builder {
|
||||
doc { "Returns a list containing all elements that are instances of specified class." }
|
||||
receiverAsterisk= true
|
||||
genericStarProjection = true
|
||||
typeParam("R")
|
||||
returns("List<R>")
|
||||
body {
|
||||
|
||||
@@ -13,7 +13,6 @@ object Numeric : TemplateGroupBase() {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: use just numericPrimitives
|
||||
private val numericPrimitivesDefaultOrder = PrimitiveType.defaultPrimitives intersect PrimitiveType.numericPrimitives
|
||||
|
||||
val f_sum = fn("sum()") {
|
||||
|
||||
@@ -60,7 +60,7 @@ class MemberBuilder(
|
||||
val typeParams = mutableListOf<String>()
|
||||
var primaryTypeParameter: String? = null; private set
|
||||
var customReceiver: String? = null; private set
|
||||
var receiverAsterisk: Boolean = false // TODO: rename to genericStarProjection
|
||||
var genericStarProjection: Boolean = false
|
||||
var toNullableT: Boolean = false
|
||||
|
||||
var returns: String? = null; private set
|
||||
@@ -246,19 +246,19 @@ class MemberBuilder(
|
||||
return answer.toString()
|
||||
}
|
||||
|
||||
val isAsteriskOrT = if (receiverAsterisk) "*" else primaryTypeParameter
|
||||
val receiverT = if (genericStarProjection) "*" else primaryTypeParameter
|
||||
val self = (when (family) {
|
||||
Iterables -> "Iterable<$isAsteriskOrT>"
|
||||
Collections -> "Collection<$isAsteriskOrT>"
|
||||
Lists -> "List<$isAsteriskOrT>"
|
||||
Iterables -> "Iterable<$receiverT>"
|
||||
Collections -> "Collection<$receiverT>"
|
||||
Lists -> "List<$receiverT>"
|
||||
Maps -> "Map<out K, V>"
|
||||
Sets -> "Set<$isAsteriskOrT>"
|
||||
Sequences -> "Sequence<$isAsteriskOrT>"
|
||||
Sets -> "Set<$receiverT>"
|
||||
Sequences -> "Sequence<$receiverT>"
|
||||
InvariantArraysOfObjects -> "Array<$primaryTypeParameter>"
|
||||
ArraysOfObjects -> "Array<${isAsteriskOrT.replace(primaryTypeParameter, "out $primaryTypeParameter")}>"
|
||||
ArraysOfObjects -> "Array<${receiverT.replace(primaryTypeParameter, "out $primaryTypeParameter")}>"
|
||||
Strings -> "String"
|
||||
CharSequences -> "CharSequence"
|
||||
Ranges -> "ClosedRange<$isAsteriskOrT>"
|
||||
Ranges -> "ClosedRange<$receiverT>"
|
||||
ArraysOfPrimitives, ArraysOfUnsigned -> primitive?.let { it.name + "Array" } ?: throw IllegalArgumentException("Primitive array should specify primitive type")
|
||||
RangesOfPrimitives -> primitive?.let { it.name + "Range" } ?: throw IllegalArgumentException("Primitive range should specify primitive type")
|
||||
ProgressionsOfPrimitives -> primitive?.let { it.name + "Progression" } ?: throw IllegalArgumentException("Primitive progression should specify primitive type")
|
||||
|
||||
Reference in New Issue
Block a user