Merge pull request #29 from k163377/feature

Fine-grained optimization.

Author: k163377

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "com.mapk"
-version = "0.15"
+version = "0.16"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -37,7 +37,7 @@ dependencies {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
     // https://mvnrepository.com/artifact/io.mockk/mockk
-    testImplementation("io.mockk:mockk:1.9.3")
+    testImplementation("io.mockk:mockk:1.10.0")
 }
 
 tasks {

src/main/kotlin/com/mapk/core/KFunctionForCall.kt

@@ -22,7 +22,7 @@ class KFunctionForCall<T> internal constructor(
     parameterNameConverter: ParameterNameConverter,
     instance: Any? = null
 ) {
-    constructor(function: KFunction<T>, parameterNameConverter: (String) -> String, instance: Any? = null) : this(
+    constructor(function: KFunction<T>, parameterNameConverter: ((String) -> String)?, instance: Any? = null) : this(
         function,
         ParameterNameConverter.Simple(parameterNameConverter),
         instance
@@ -44,24 +44,25 @@ class KFunctionForCall<T> internal constructor(
         // この関数には確実にアクセスするためアクセシビリティ書き換え
         function.isAccessible = true
 
-        val binders: List<ArgumentBinder> = parameters
-            .filter { it.kind == KParameter.Kind.VALUE && !it.isUseDefaultArgument() }
-            .map { it.toArgumentBinder(parameterNameConverter) }
+        val tempBinders = ArrayList<ArgumentBinder>()
+        val tempList = ArrayList<ValueParameter<*>>()
+        val tempMap = HashMap<String, ValueParameter<*>>()
 
-        bucketGenerator = BucketGenerator(parameters, binders, instance)
+        parameters.forEach { param ->
+            if (param.kind == KParameter.Kind.VALUE && !param.isUseDefaultArgument()) {
+                val binder = param.toArgumentBinder(parameterNameConverter)
+                tempBinders.add(binder)
 
-        val tempList = ArrayList<ValueParameter<*>>(binders.size)
-        val tempMap = HashMap<String, ValueParameter<*>>(binders.size)
-
-        binders.forEach { binder ->
-            when (binder) {
-                is ArgumentBinder.Value<*> -> addArgs(binder, tempList, tempMap)
-                is ArgumentBinder.Function -> binder.requiredParameters.forEach {
-                    addArgs(it, tempList, tempMap)
+                when (binder) {
+                    is ArgumentBinder.Value<*> -> addArgs(binder, tempList, tempMap)
+                    is ArgumentBinder.Function -> binder.requiredParameters.forEach {
+                        addArgs(it, tempList, tempMap)
+                    }
                 }
             }
         }
 
+        bucketGenerator = BucketGenerator(parameters, tempBinders, instance)
         requiredParameters = tempList
         requiredParametersMap = tempMap
     }
@@ -107,7 +108,7 @@ internal fun <T : Any> KClass<T>.toKConstructor(parameterNameConverter: Paramete
 }
 
 @Suppress("UNCHECKED_CAST")
-fun <T : Any> KClass<T>.toKConstructor(parameterNameConverter: (String) -> String): KFunctionForCall<T> =
+fun <T : Any> KClass<T>.toKConstructor(parameterNameConverter: ((String) -> String)?): KFunctionForCall<T> =
     this.toKConstructor(ParameterNameConverter.Simple(parameterNameConverter))
 
 private fun KParameter.toArgumentBinder(parameterNameConverter: ParameterNameConverter): ArgumentBinder {

src/main/kotlin/com/mapk/core/internal/ArgumentBucket.kt

@@ -31,7 +31,7 @@ internal class ArgumentBucket(
             }
         }
 
-        initializationStatuses = initializationStatus.toList()
+        initializationStatuses = initializationStatus.asList()
         isInitialized = count == initializationStatus.size
         size = count
     }

src/main/kotlin/com/mapk/core/internal/ParameterNameConverter.kt

@@ -2,27 +2,28 @@ package com.mapk.core.internal
 
 import com.mapk.core.NameJoiner
 
-internal sealed class ParameterNameConverter {
-    protected abstract val converter: (String) -> String
+internal sealed class ParameterNameConverter(protected val converter: ((String) -> String)?) {
     abstract fun convert(name: String): String
     abstract fun nest(infix: String, nameJoiner: NameJoiner): WithPrefix
     abstract fun toSimple(): Simple
 
-    class Simple(override val converter: (String) -> String) : ParameterNameConverter() {
-        override fun convert(name: String) = converter(name)
+    protected fun convertedOrName(name: String): String = converter?.invoke(name) ?: name
+
+    class Simple(converter: ((String) -> String)?) : ParameterNameConverter(converter) {
+        override fun convert(name: String) = convertedOrName(name)
         override fun nest(infix: String, nameJoiner: NameJoiner) = WithPrefix(infix, nameJoiner, converter)
         override fun toSimple(): Simple = this
     }
 
     class WithPrefix(
         prefix: String,
         private val nameJoiner: NameJoiner,
-        override val converter: (String) -> String
-    ) : ParameterNameConverter() {
-        private val prefix = converter(prefix)
+        converter: ((String) -> String)?
+    ) : ParameterNameConverter(converter) {
+        private val prefix = convertedOrName(prefix)
 
         // 結合を伴う変換では、「双方変換 -> 結合」の順で処理を行う
-        override fun convert(name: String) = converter(name).let { nameJoiner.join(prefix, it) }
+        override fun convert(name: String) = convertedOrName(name).let { nameJoiner.join(prefix, it) }
         override fun nest(infix: String, nameJoiner: NameJoiner) = WithPrefix(convert(infix), nameJoiner, converter)
         override fun toSimple(): Simple = Simple(converter)
     }