[IR] Simplify ExpectActualCollector, remove nesting
This commit is contained in:
Ivan Kochurkin
committed by
Space Team
Space Team
parent
010c7acc3a
commit
a54b56d74e
+128
-129
@@ -23,7 +23,7 @@ internal class ExpectActualCollector(private val mainFragment: IrModuleFragment,
|
||||
val result = mutableMapOf<IrSymbol, IrSymbol>()
|
||||
// Collect and link classifiers at first to make it possible to expand type aliases on the callables linking
|
||||
val (allActualDeclarations, typeAliasMap) = result.appendExpectActualClassifiersMap()
|
||||
result.appendExpectActualCallablesMap(allActualDeclarations, typeAliasMap, dependentFragments)
|
||||
result.appendExpectActualCallablesMap(allActualDeclarations, typeAliasMap)
|
||||
return result to typeAliasMap
|
||||
}
|
||||
|
||||
@@ -44,92 +44,9 @@ internal class ExpectActualCollector(private val mainFragment: IrModuleFragment,
|
||||
return allActualDeclarations to typeAliasMap
|
||||
}
|
||||
|
||||
class ActualClassifiersCollector(
|
||||
private val actualClassifiers: MutableMap<FqName, IrSymbol>,
|
||||
private val allActualClassifiers: MutableSet<IrDeclaration>,
|
||||
private val typeAliasMap: MutableMap<FqName, FqName>
|
||||
) : IrElementVisitor<Unit, Boolean> {
|
||||
override fun visitTypeAlias(declaration: IrTypeAlias, data: Boolean) {
|
||||
if (declaration.isActual) {
|
||||
val expandedTypeSymbol = declaration.expandedType.classifierOrFail
|
||||
actualClassifiers[declaration.kotlinFqName] = expandedTypeSymbol
|
||||
if (expandedTypeSymbol is IrClassSymbol) {
|
||||
allActualClassifiers.add(expandedTypeSymbol.owner)
|
||||
typeAliasMap[declaration.kotlinFqName] = expandedTypeSymbol.owner.kotlinFqName
|
||||
}
|
||||
}
|
||||
visitElement(declaration, data)
|
||||
}
|
||||
|
||||
override fun visitClass(declaration: IrClass, data: Boolean) {
|
||||
if (!data && !declaration.isExpect) {
|
||||
actualClassifiers[declaration.kotlinFqName] = declaration.symbol
|
||||
}
|
||||
visitDeclaration(declaration, data)
|
||||
}
|
||||
|
||||
override fun visitEnumEntry(declaration: IrEnumEntry, data: Boolean) {
|
||||
if (!data && !declaration.isExpect) {
|
||||
actualClassifiers[FqName.fromSegments(
|
||||
listOf(
|
||||
declaration.parent.kotlinFqName.asString(),
|
||||
declaration.name.asString()
|
||||
)
|
||||
)] = declaration.symbol
|
||||
}
|
||||
visitDeclaration(declaration, data)
|
||||
}
|
||||
|
||||
override fun visitDeclaration(declaration: IrDeclarationBase, data: Boolean) {
|
||||
if (!data && !declaration.isExpect) {
|
||||
allActualClassifiers.add(declaration)
|
||||
}
|
||||
visitElement(declaration, data || declaration.isExpect)
|
||||
}
|
||||
|
||||
override fun visitElement(element: IrElement, data: Boolean) {
|
||||
element.acceptChildren(this, data)
|
||||
}
|
||||
}
|
||||
|
||||
class ClassifiersLinkCollector(
|
||||
private val expectActualMap: MutableMap<IrSymbol, IrSymbol>,
|
||||
private val actualClassifiers: Map<FqName, IrSymbol>
|
||||
) : IrElementVisitorVoid {
|
||||
private fun addLinkOrReportMissing(expectElement: IrSymbolOwner, actualTypeId: FqName) {
|
||||
val actualClassifier = actualClassifiers[actualTypeId]
|
||||
if (actualClassifier != null) {
|
||||
expectActualMap[expectElement.symbol] = actualClassifier
|
||||
} else {
|
||||
reportMissingActual(expectElement)
|
||||
}
|
||||
}
|
||||
|
||||
override fun visitClass(declaration: IrClass) {
|
||||
if (declaration.isExpect) {
|
||||
addLinkOrReportMissing(declaration, declaration.kotlinFqName)
|
||||
}
|
||||
visitElement(declaration)
|
||||
}
|
||||
|
||||
override fun visitEnumEntry(declaration: IrEnumEntry) {
|
||||
if (declaration.isProperExpect) {
|
||||
addLinkOrReportMissing(
|
||||
declaration, FqName.fromSegments(listOf(declaration.parent.kotlinFqName.asString(), declaration.name.asString()))
|
||||
)
|
||||
}
|
||||
visitElement(declaration)
|
||||
}
|
||||
|
||||
override fun visitElement(element: IrElement) {
|
||||
element.acceptChildrenVoid(this)
|
||||
}
|
||||
}
|
||||
|
||||
private fun MutableMap<IrSymbol, IrSymbol>.appendExpectActualCallablesMap(
|
||||
allActualDeclarations: Set<IrDeclaration>,
|
||||
typeAliasMap: Map<FqName, FqName>,
|
||||
dependentFragments: List<IrModuleFragment>
|
||||
typeAliasMap: Map<FqName, FqName>
|
||||
) {
|
||||
val actualMembers = mutableMapOf<String, IrDeclarationBase>()
|
||||
|
||||
@@ -137,57 +54,139 @@ internal class ExpectActualCollector(private val mainFragment: IrModuleFragment,
|
||||
val collector = CallablesLinkCollector(this, actualMembers, typeAliasMap)
|
||||
dependentFragments.forEach { collector.visitModuleFragment(it) }
|
||||
}
|
||||
}
|
||||
|
||||
private fun collectActualCallables(
|
||||
expectActualMap: MutableMap<IrSymbol, IrSymbol>,
|
||||
actualMembers: MutableMap<String, IrDeclarationBase>,
|
||||
allActualDeclarations: Set<IrDeclaration>,
|
||||
) {
|
||||
fun collectActualsCallables(declaration: IrDeclaration) {
|
||||
when (declaration) {
|
||||
is IrFunction,
|
||||
is IrProperty -> {
|
||||
actualMembers[generateIrElementFullName(declaration, expectActualMap)] = declaration as IrDeclarationBase
|
||||
}
|
||||
is IrClass -> {
|
||||
for (member in declaration.declarations) {
|
||||
collectActualsCallables(member)
|
||||
}
|
||||
}
|
||||
private class ActualClassifiersCollector(
|
||||
private val actualClassifiers: MutableMap<FqName, IrSymbol>,
|
||||
private val allActualClassifiers: MutableSet<IrDeclaration>,
|
||||
private val typeAliasMap: MutableMap<FqName, FqName>
|
||||
) : IrElementVisitor<Unit, Boolean> {
|
||||
override fun visitTypeAlias(declaration: IrTypeAlias, data: Boolean) {
|
||||
if (declaration.isActual) {
|
||||
val expandedTypeSymbol = declaration.expandedType.classifierOrFail
|
||||
actualClassifiers[declaration.kotlinFqName] = expandedTypeSymbol
|
||||
if (expandedTypeSymbol is IrClassSymbol) {
|
||||
allActualClassifiers.add(expandedTypeSymbol.owner)
|
||||
typeAliasMap[declaration.kotlinFqName] = expandedTypeSymbol.owner.kotlinFqName
|
||||
}
|
||||
}
|
||||
|
||||
for (actualDeclaration in allActualDeclarations) {
|
||||
collectActualsCallables(actualDeclaration)
|
||||
}
|
||||
visitElement(declaration, data)
|
||||
}
|
||||
|
||||
class CallablesLinkCollector(
|
||||
private val expectActualMap: MutableMap<IrSymbol, IrSymbol>,
|
||||
private val actualMembers: Map<String, IrDeclarationBase>,
|
||||
private val typeAliasMap: Map<FqName, FqName>
|
||||
) : IrElementVisitorVoid {
|
||||
override fun visitFunction(declaration: IrFunction) = addLink(declaration)
|
||||
|
||||
override fun visitProperty(declaration: IrProperty) = addLink(declaration)
|
||||
|
||||
private fun addLink(declaration: IrDeclarationBase) {
|
||||
if (!declaration.isExpect) return
|
||||
val member = actualMembers[generateIrElementFullName(declaration, expectActualMap, typeAliasMap)]
|
||||
if (member != null) {
|
||||
expectActualMap[declaration.symbol] = member.symbol
|
||||
if (declaration is IrProperty) {
|
||||
member as IrProperty
|
||||
declaration.getter?.symbol?.let { expectActualMap[it] = member.getter!!.symbol }
|
||||
declaration.setter?.symbol?.let { expectActualMap[it] = member.setter!!.symbol }
|
||||
}
|
||||
} else {
|
||||
reportMissingActual(declaration)
|
||||
}
|
||||
override fun visitClass(declaration: IrClass, data: Boolean) {
|
||||
if (!data && !declaration.isExpect) {
|
||||
actualClassifiers[declaration.kotlinFqName] = declaration.symbol
|
||||
}
|
||||
visitDeclaration(declaration, data)
|
||||
}
|
||||
|
||||
override fun visitElement(element: IrElement) {
|
||||
element.acceptChildrenVoid(this)
|
||||
override fun visitEnumEntry(declaration: IrEnumEntry, data: Boolean) {
|
||||
if (!data && !declaration.isExpect) {
|
||||
actualClassifiers[FqName.fromSegments(
|
||||
listOf(
|
||||
declaration.parent.kotlinFqName.asString(),
|
||||
declaration.name.asString()
|
||||
)
|
||||
)] = declaration.symbol
|
||||
}
|
||||
visitDeclaration(declaration, data)
|
||||
}
|
||||
|
||||
override fun visitDeclaration(declaration: IrDeclarationBase, data: Boolean) {
|
||||
if (!data && !declaration.isExpect) {
|
||||
allActualClassifiers.add(declaration)
|
||||
}
|
||||
visitElement(declaration, data || declaration.isExpect)
|
||||
}
|
||||
|
||||
override fun visitElement(element: IrElement, data: Boolean) {
|
||||
element.acceptChildren(this, data)
|
||||
}
|
||||
}
|
||||
|
||||
private class ClassifiersLinkCollector(
|
||||
private val expectActualMap: MutableMap<IrSymbol, IrSymbol>,
|
||||
private val actualClassifiers: Map<FqName, IrSymbol>
|
||||
) : IrElementVisitorVoid {
|
||||
private fun addLinkOrReportMissing(expectElement: IrSymbolOwner, actualTypeId: FqName) {
|
||||
val actualClassifier = actualClassifiers[actualTypeId]
|
||||
if (actualClassifier != null) {
|
||||
expectActualMap[expectElement.symbol] = actualClassifier
|
||||
} else {
|
||||
reportMissingActual(expectElement)
|
||||
}
|
||||
}
|
||||
|
||||
override fun visitClass(declaration: IrClass) {
|
||||
if (declaration.isExpect) {
|
||||
addLinkOrReportMissing(declaration, declaration.kotlinFqName)
|
||||
}
|
||||
visitElement(declaration)
|
||||
}
|
||||
|
||||
override fun visitEnumEntry(declaration: IrEnumEntry) {
|
||||
if (declaration.isProperExpect) {
|
||||
addLinkOrReportMissing(
|
||||
declaration, FqName.fromSegments(listOf(declaration.parent.kotlinFqName.asString(), declaration.name.asString()))
|
||||
)
|
||||
}
|
||||
visitElement(declaration)
|
||||
}
|
||||
|
||||
override fun visitElement(element: IrElement) {
|
||||
element.acceptChildrenVoid(this)
|
||||
}
|
||||
}
|
||||
|
||||
private fun collectActualCallables(
|
||||
expectActualMap: MutableMap<IrSymbol, IrSymbol>,
|
||||
actualMembers: MutableMap<String, IrDeclarationBase>,
|
||||
allActualDeclarations: Set<IrDeclaration>,
|
||||
) {
|
||||
fun collectActualsCallables(declaration: IrDeclaration) {
|
||||
when (declaration) {
|
||||
is IrFunction,
|
||||
is IrProperty -> {
|
||||
actualMembers[generateIrElementFullName(declaration, expectActualMap)] = declaration as IrDeclarationBase
|
||||
}
|
||||
is IrClass -> {
|
||||
for (member in declaration.declarations) {
|
||||
collectActualsCallables(member)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (actualDeclaration in allActualDeclarations) {
|
||||
collectActualsCallables(actualDeclaration)
|
||||
}
|
||||
}
|
||||
|
||||
private class CallablesLinkCollector(
|
||||
private val expectActualMap: MutableMap<IrSymbol, IrSymbol>,
|
||||
private val actualMembers: Map<String, IrDeclarationBase>,
|
||||
private val typeAliasMap: Map<FqName, FqName>
|
||||
) : IrElementVisitorVoid {
|
||||
override fun visitFunction(declaration: IrFunction) = addLink(declaration)
|
||||
|
||||
override fun visitProperty(declaration: IrProperty) = addLink(declaration)
|
||||
|
||||
private fun addLink(declaration: IrDeclarationBase) {
|
||||
if (!declaration.isExpect) return
|
||||
val member = actualMembers[generateIrElementFullName(declaration, expectActualMap, typeAliasMap)]
|
||||
if (member != null) {
|
||||
expectActualMap[declaration.symbol] = member.symbol
|
||||
if (declaration is IrProperty) {
|
||||
member as IrProperty
|
||||
declaration.getter?.symbol?.let { expectActualMap[it] = member.getter!!.symbol }
|
||||
declaration.setter?.symbol?.let { expectActualMap[it] = member.setter!!.symbol }
|
||||
}
|
||||
} else {
|
||||
reportMissingActual(declaration)
|
||||
}
|
||||
}
|
||||
|
||||
override fun visitElement(element: IrElement) {
|
||||
element.acceptChildrenVoid(this)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user