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

FIR: Pull down FirScope.processOverriddenFunctions

Browse Source
This commit is contained in:
Denis Zharkov
2020-06-09 16:16:53 +03:00
parent 6178cb7206
commit 89cbe9bf93
3 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirIterableScope.kt
-8
View File
@@ -45,12 +45,4 @@ abstract class FirIterableScope : FirScope() {
override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
return processComposite(FirScope::processPropertiesByName, name, processor)
}
override fun processOverriddenFunctions(functionSymbol: FirFunctionSymbol<*>, processor: (FirFunctionSymbol<*>) -> ProcessorAction): ProcessorAction {
for (scope in scopes) {
if (!scope.processOverriddenFunctions(functionSymbol, processor)) return ProcessorAction.STOP
}
return ProcessorAction.NEXT
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScope.kt
-30
View File
@@ -34,36 +34,6 @@ abstract class FirScope {
open fun mayContainName(name: Name) = true
// Currently, this function has very weak guarantees
// - It may silently do nothing on symbols originated from different scope instance
// - It may return the same overridden symbols more then once in case of substitution
// - It doesn't guarantee any specific order in which overridden tree will be traversed
// But if the scope instance is the same as the one from which the symbol was originated, this function will enumarate all members
// of the overridden tree
// TODO: Consider extracting this function to a separate abstract class/interface, so only limited types of scopes would be supporing it
// on interface level
open fun processOverriddenFunctions(
functionSymbol: FirFunctionSymbol<*>,
processor: (FirFunctionSymbol<*>) -> ProcessorAction
): ProcessorAction = ProcessorAction.NONE
// This is just a helper for a common implementation
protected fun doProcessOverriddenFunctions(
functionSymbol: FirFunctionSymbol<*>,
processor: (FirFunctionSymbol<*>) -> ProcessorAction,
directOverriddenMap: Map<FirFunctionSymbol<*>, Collection<FirFunctionSymbol<*>>>,
baseScope: FirScope
): ProcessorAction {
val directOverridden =
directOverriddenMap[functionSymbol] ?: return baseScope.processOverriddenFunctions(functionSymbol, processor)
for (overridden in directOverridden) {
if (!processor(overridden)) return ProcessorAction.STOP
if (!baseScope.processOverriddenFunctions(overridden, processor)) return ProcessorAction.STOP
}
return ProcessorAction.NEXT
}
}
fun FirTypeScope.processOverriddenFunctionsAndSelf(
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt
+25 -8
View File
@@ -8,15 +8,32 @@ package org.jetbrains.kotlin.fir.scopes
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
abstract class FirTypeScope : FirScope() {
// Initially, this method is intended to belong only to this class, but not to FirScope
// But the main-use case (FirSyntheticPropertiesScope) uses it on arbitrary type (intersection and others) that currently use
// scope implementations for type-unrelated scopes as well
// One of the idea how to fix it is considered extracting it to the interface
//
// The idea behind this class and abstract override is to explicitly state that those implementations should implement this method properly
// and use other FirOverrideAwareScope when delegating to them (as in FirClassSubstitutionScope)
abstract override fun processOverriddenFunctions(
// Currently, this function has very weak guarantees
// - It may silently do nothing on symbols originated from different scope instance
// - It may return the same overridden symbols more then once in case of substitution
// - It doesn't guarantee any specific order in which overridden tree will be traversed
// But if the scope instance is the same as the one from which the symbol was originated, this function will enumarate all members
// of the overridden tree
abstract fun processOverriddenFunctions(
functionSymbol: FirFunctionSymbol<*>,
processor: (FirFunctionSymbol<*>) -> ProcessorAction
): ProcessorAction
// This is just a helper for a common implementation
protected fun doProcessOverriddenFunctions(
functionSymbol: FirFunctionSymbol<*>,
processor: (FirFunctionSymbol<*>) -> ProcessorAction,
directOverriddenMap: Map<FirFunctionSymbol<*>, Collection<FirFunctionSymbol<*>>>,
baseScope: FirTypeScope
): ProcessorAction {
val directOverridden =
directOverriddenMap[functionSymbol] ?: return baseScope.processOverriddenFunctions(functionSymbol, processor)
for (overridden in directOverridden) {
if (!processor(overridden)) return ProcessorAction.STOP
if (!baseScope.processOverriddenFunctions(overridden, processor)) return ProcessorAction.STOP
}
return ProcessorAction.NEXT
}
}