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

FIR DFA: refactor type statements manipulation

Browse Source
This commit is contained in:
Jinseong Jeon
2020-12-01 10:24:45 -08:00
committed by Dmitriy Novozhilov
parent 7ea58adc50
commit 16b9312695
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/LogicSystem.kt
+11 -12
View File
@@ -122,16 +122,22 @@ abstract class LogicSystem<FLOW : Flow>(protected val context: ConeInferenceCont
return result return result
} }
protected fun or(statements: Collection<TypeStatement>): MutableTypeStatement { private inline fun manipulateTypeStatements(
statements: Collection<TypeStatement>,
op: (Collection<Set<ConeKotlinType>>) -> MutableSet<ConeKotlinType>
): MutableTypeStatement {
require(statements.isNotEmpty()) require(statements.isNotEmpty())
statements.singleOrNull()?.let { return it as MutableTypeStatement } statements.singleOrNull()?.let { return it as MutableTypeStatement }
val variable = statements.first().variable val variable = statements.first().variable
assert(statements.all { it.variable == variable }) assert(statements.all { it.variable == variable })
val exactType = orForTypes(statements.map { it.exactType }) val exactType = op.invoke(statements.map { it.exactType })
val exactNotType = orForTypes(statements.map { it.exactNotType }) val exactNotType = op.invoke(statements.map { it.exactNotType })
return MutableTypeStatement(variable, exactType, exactNotType) return MutableTypeStatement(variable, exactType, exactNotType)
} }
protected fun or(statements: Collection<TypeStatement>): MutableTypeStatement =
manipulateTypeStatements(statements, ::orForTypes)
private fun orForTypes(types: Collection<Set<ConeKotlinType>>): MutableSet<ConeKotlinType> { private fun orForTypes(types: Collection<Set<ConeKotlinType>>): MutableSet<ConeKotlinType> {
if (types.any { it.isEmpty() }) return mutableSetOf() if (types.any { it.isEmpty() }) return mutableSetOf()
val allTypes = types.flatMapTo(mutableSetOf()) { it } val allTypes = types.flatMapTo(mutableSetOf()) { it }
@@ -144,15 +150,8 @@ abstract class LogicSystem<FLOW : Flow>(protected val context: ConeInferenceCont
return commonTypes return commonTypes
} }
protected fun and(statements: Collection<TypeStatement>): MutableTypeStatement { protected fun and(statements: Collection<TypeStatement>): MutableTypeStatement =
require(statements.isNotEmpty()) manipulateTypeStatements(statements, ::andForTypes)
statements.singleOrNull()?.let { return it as MutableTypeStatement }
val variable = statements.first().variable
assert(statements.all { it.variable == variable })
val exactType = andForTypes(statements.map { it.exactType })
val exactNotType = andForTypes(statements.map { it.exactNotType })
return MutableTypeStatement(variable, exactType, exactNotType)
}
private fun andForTypes(types: Collection<Set<ConeKotlinType>>): MutableSet<ConeKotlinType> { private fun andForTypes(types: Collection<Set<ConeKotlinType>>): MutableSet<ConeKotlinType> {
return types.flatMapTo(mutableSetOf()) { it } return types.flatMapTo(mutableSetOf()) { it }