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

Minor. Rename DelegatingDataFlowInfo -> DataFlowInfoImpl

Browse Source
This commit is contained in:
Denis Zharkov
2018-08-06 17:45:33 +07:00
parent 0eba48ae46
commit 3e3841d17e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfo.kt
+1 -1
View File
@@ -101,5 +101,5 @@ interface DataFlowInfo {
object DataFlowInfoFactory { object DataFlowInfoFactory {
@JvmField @JvmField
val EMPTY: DataFlowInfo = DelegatingDataFlowInfo() val EMPTY: DataFlowInfo = DataFlowInfoImpl()
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DelegatingDataFlowInfo.kt → compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowInfoImpl.kt
+4 -4
View File
@@ -40,7 +40,7 @@ private fun <K, V> ImmutableMultimap<K, V>.put(key: K, value: V): ImmutableMulti
return put(key, oldSet.add(value)) return put(key, oldSet.add(value))
} }
internal class DelegatingDataFlowInfo private constructor( internal class DataFlowInfoImpl private constructor(
override val completeNullabilityInfo: ImmutableMap<DataFlowValue, Nullability>, override val completeNullabilityInfo: ImmutableMap<DataFlowValue, Nullability>,
override val completeTypeInfo: ImmutableMultimap<DataFlowValue, KotlinType> override val completeTypeInfo: ImmutableMultimap<DataFlowValue, KotlinType>
) : DataFlowInfo { ) : DataFlowInfo {
@@ -267,7 +267,7 @@ internal class DelegatingDataFlowInfo private constructor(
if (this === DataFlowInfo.EMPTY) return other if (this === DataFlowInfo.EMPTY) return other
if (this === other) return this if (this === other) return this
assert(other is DelegatingDataFlowInfo) { "Unknown DataFlowInfo type: " + other } assert(other is DataFlowInfoImpl) { "Unknown DataFlowInfo type: " + other }
val resultNullabilityInfo = hashMapOf<DataFlowValue, Nullability>() val resultNullabilityInfo = hashMapOf<DataFlowValue, Nullability>()
for ((key, otherFlags) in other.completeNullabilityInfo) { for ((key, otherFlags) in other.completeNullabilityInfo) {
@@ -304,7 +304,7 @@ internal class DelegatingDataFlowInfo private constructor(
if (this === DataFlowInfo.EMPTY) return DataFlowInfo.EMPTY if (this === DataFlowInfo.EMPTY) return DataFlowInfo.EMPTY
if (this === other) return this if (this === other) return this
assert(other is DelegatingDataFlowInfo) { "Unknown DataFlowInfo type: " + other } assert(other is DataFlowInfoImpl) { "Unknown DataFlowInfo type: " + other }
val resultNullabilityInfo = hashMapOf<DataFlowValue, Nullability>() val resultNullabilityInfo = hashMapOf<DataFlowValue, Nullability>()
for ((key, otherFlags) in other.completeNullabilityInfo) { for ((key, otherFlags) in other.completeNullabilityInfo) {
@@ -390,7 +390,7 @@ internal class DelegatingDataFlowInfo private constructor(
return parent return parent
} }
return DelegatingDataFlowInfo(resultingNullabilityInfo, resultingTypeInfo) return DataFlowInfoImpl(resultingNullabilityInfo, resultingTypeInfo)
} }
} }
} }