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

[stdlib-gen] Minor refactoring: use enum entries instead of values

Browse Source
This commit is contained in:
Ilya Gorbunov
2023-10-06 21:38:37 +02:00
committed by Space Team
parent ff2254db69
commit 3622ea2e33
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
+2 -2
View File
@@ -444,8 +444,8 @@ object ArrayOps : TemplateGroupBase() {
} }
val f_toPrimitiveArray = fn("toPrimitiveArray()") { val f_toPrimitiveArray = fn("toPrimitiveArray()") {
include(ArraysOfObjects, PrimitiveType.values().toSet()) include(ArraysOfObjects, PrimitiveType.entries.toSet())
include(Collections, PrimitiveType.values().toSet()) include(Collections, PrimitiveType.entries.toSet())
} builder { } builder {
val primitive = checkNotNull(primitive) val primitive = checkNotNull(primitive)
val arrayType = primitive.name + "Array" val arrayType = primitive.name + "Array"
libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt
+1 -5
View File
@@ -59,7 +59,7 @@ enum class PrimitiveType {
companion object { companion object {
val unsignedPrimitives = setOf(UInt, ULong, UByte, UShort) val unsignedPrimitives = setOf(UInt, ULong, UByte, UShort)
val defaultPrimitives = PrimitiveType.values().toSet() - unsignedPrimitives val defaultPrimitives = PrimitiveType.entries.toSet() - unsignedPrimitives
val numericPrimitives = setOf(Int, Long, Byte, Short, Double, Float) val numericPrimitives = setOf(Int, Long, Byte, Short, Double, Float)
val integralPrimitives = setOf(Int, Long, Byte, Short, Char) val integralPrimitives = setOf(Int, Long, Byte, Short, Char)
val floatingPointPrimitives = setOf(Double, Float) val floatingPointPrimitives = setOf(Double, Float)
@@ -124,10 +124,6 @@ enum class KotlinTarget(val platform: Platform, val backend: Backend) {
Native(Platform.Native, Backend.IR); Native(Platform.Native, Backend.IR);
val fullName get() = "Kotlin/$name" val fullName get() = "Kotlin/$name"
companion object {
val values = KotlinTarget.values().toList()
}
} }
enum class SequenceClass { enum class SequenceClass {
libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt
+2 -2
View File
@@ -53,7 +53,7 @@ interface MemberTemplate {
/** Specifies which platforms this member template should be generated for */ /** Specifies which platforms this member template should be generated for */
fun platforms(vararg platforms: Platform) fun platforms(vararg platforms: Platform)
fun instantiate(targets: Collection<KotlinTarget> = KotlinTarget.values): Sequence<MemberBuilder> fun instantiate(targets: Collection<KotlinTarget> = KotlinTarget.entries): Sequence<MemberBuilder>
/** Registers parameterless member builder function */ /** Registers parameterless member builder function */
fun builder(b: MemberBuildAction) fun builder(b: MemberBuildAction)
@@ -78,7 +78,7 @@ abstract class MemberTemplateDefinition<TParam> : MemberTemplate {
private val buildActions = mutableListOf<BuildAction>() private val buildActions = mutableListOf<BuildAction>()
private var allowedPlatforms = setOf(*Platform.values()) private var allowedPlatforms = Platform.entries.toSet()
override fun platforms(vararg platforms: Platform) { override fun platforms(vararg platforms: Platform) {
allowedPlatforms = setOf(*platforms) allowedPlatforms = setOf(*platforms)
} }