From dc3ee6318c1629f53ec35a84b478e83743a22a7e Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 21 Jun 2021 11:18:26 +0300 Subject: [PATCH] [FIR] Rename type parameters of NullableMap from `KEY`, `VALUE` to `K`, `V` --- .../src/org/jetbrains/kotlin/fir/caches/NullableMap.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/caches/NullableMap.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/caches/NullableMap.kt index a3544028c54..0f1e6788cb1 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/caches/NullableMap.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/caches/NullableMap.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.PrivateForInline */ @OptIn(PrivateForInline::class) @JvmInline -internal value class NullableMap(private val map: MutableMap = HashMap()) { +internal value class NullableMap(private val map: MutableMap = HashMap()) { /** * Get value if it is present in map @@ -20,15 +20,15 @@ internal value class NullableMap(private val map: MutableMap VALUE): VALUE = + inline fun getOrElse(key: K, orElse: () -> V): V = when (val value = map[key]) { null -> orElse() NullValue -> null else -> value - } as VALUE + } as V @Suppress("NOTHING_TO_INLINE") - inline operator fun set(key: KEY, value: VALUE) { + inline operator fun set(key: K, value: V) { map[key] = value ?: NullValue } }