From df8709cafc607f17f4a6f4d76e419781af022161 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sat, 4 Apr 2020 14:31:01 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=8CInitializationStatusManager=E3=81=A8=E3=81=AE?= =?UTF-8?q?=E9=96=93=E3=81=A72=E9=87=8D=E3=81=AB=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/mapk/core/ArgumentBucket.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/mapk/core/ArgumentBucket.kt b/src/main/kotlin/com/mapk/core/ArgumentBucket.kt index 8e519f8..5b554b0 100644 --- a/src/main/kotlin/com/mapk/core/ArgumentBucket.kt +++ b/src/main/kotlin/com/mapk/core/ArgumentBucket.kt @@ -9,9 +9,6 @@ class ArgumentBucket internal constructor( private val isRequireNonNull: List, private val initializationStatusManager: InitializationStatusManager ) : Map { - // インスタンス有りなら1、そうでなければ0スタート - private var count: Int = initializationStatusManager.count - val isInitialized: Boolean get() = initializationStatusManager.isFullInitialized class Entry internal constructor( @@ -19,7 +16,7 @@ class ArgumentBucket internal constructor( override var value: Any? ) : Map.Entry - override val size: Int get() = count + override val size: Int get() = initializationStatusManager.count override fun containsKey(key: KParameter): Boolean { return initializationStatusManager.isInitialized(key.index) @@ -32,7 +29,7 @@ class ArgumentBucket internal constructor( if (initializationStatusManager.isInitialized(key)) valueArray[key] else throw IllegalStateException("This argument is not initialized.") - override fun isEmpty(): Boolean = count == 0 + override fun isEmpty(): Boolean = initializationStatusManager.count == 0 override val entries: Set> get() = keyList @@ -53,7 +50,6 @@ class ArgumentBucket internal constructor( // 先に入ったものを優先するため、初期化済みなら何もしない if (initializationStatusManager.isInitialized(index)) return - count += 1 initializationStatusManager.put(index) valueArray[index] = value