From 3e3841d17e2af9941ea4ff18d92ba757f428e4f3 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 6 Aug 2018 17:45:33 +0700 Subject: [PATCH] Minor. Rename DelegatingDataFlowInfo -> DataFlowInfoImpl --- .../kotlin/resolve/calls/smartcasts/DataFlowInfo.kt | 2 +- .../{DelegatingDataFlowInfo.kt => DataFlowInfoImpl.kt} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/{DelegatingDataFlowInfo.kt => DataFlowInfoImpl.kt} (98%) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.kt index d9fb6d5a810..b738f9911ff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.kt @@ -101,5 +101,5 @@ interface DataFlowInfo { object DataFlowInfoFactory { @JvmField - val EMPTY: DataFlowInfo = DelegatingDataFlowInfo() + val EMPTY: DataFlowInfo = DataFlowInfoImpl() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DelegatingDataFlowInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfoImpl.kt similarity index 98% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DelegatingDataFlowInfo.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfoImpl.kt index aa20759f5c2..fa54e4eba17 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DelegatingDataFlowInfo.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfoImpl.kt @@ -40,7 +40,7 @@ private fun ImmutableMultimap.put(key: K, value: V): ImmutableMulti return put(key, oldSet.add(value)) } -internal class DelegatingDataFlowInfo private constructor( +internal class DataFlowInfoImpl private constructor( override val completeNullabilityInfo: ImmutableMap, override val completeTypeInfo: ImmutableMultimap ) : DataFlowInfo { @@ -267,7 +267,7 @@ internal class DelegatingDataFlowInfo private constructor( if (this === DataFlowInfo.EMPTY) return other if (this === other) return this - assert(other is DelegatingDataFlowInfo) { "Unknown DataFlowInfo type: " + other } + assert(other is DataFlowInfoImpl) { "Unknown DataFlowInfo type: " + other } val resultNullabilityInfo = hashMapOf() for ((key, otherFlags) in other.completeNullabilityInfo) { @@ -304,7 +304,7 @@ internal class DelegatingDataFlowInfo private constructor( if (this === DataFlowInfo.EMPTY) return DataFlowInfo.EMPTY if (this === other) return this - assert(other is DelegatingDataFlowInfo) { "Unknown DataFlowInfo type: " + other } + assert(other is DataFlowInfoImpl) { "Unknown DataFlowInfo type: " + other } val resultNullabilityInfo = hashMapOf() for ((key, otherFlags) in other.completeNullabilityInfo) { @@ -390,7 +390,7 @@ internal class DelegatingDataFlowInfo private constructor( return parent } - return DelegatingDataFlowInfo(resultingNullabilityInfo, resultingTypeInfo) + return DataFlowInfoImpl(resultingNullabilityInfo, resultingTypeInfo) } } }