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

FIR: Get rid of last usages of FirScope.processOverriddenFunctions

Browse Source
This commit is contained in:
Denis Zharkov
2020-06-09 16:14:53 +03:00
parent 72b09ff323
commit 6178cb7206
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/FirReceivers.kt
+4 -4
View File
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.constructType import org.jetbrains.kotlin.fir.resolve.constructType
import org.jetbrains.kotlin.fir.resolve.scope import org.jetbrains.kotlin.fir.resolve.scope
import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype import org.jetbrains.kotlin.fir.resolvedTypeFromPrototype
import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.FirTypeScope
import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
@@ -34,7 +34,7 @@ interface ReceiverValue : Receiver {
val receiverExpression: FirExpression val receiverExpression: FirExpression
fun scope(useSiteSession: FirSession, scopeSession: ScopeSession): FirScope? = fun scope(useSiteSession: FirSession, scopeSession: ScopeSession): FirTypeScope? =
type.scope(useSiteSession, scopeSession) type.scope(useSiteSession, scopeSession)
} }
@@ -85,10 +85,10 @@ sealed class ImplicitReceiverValue<S : AbstractFirBasedSymbol<*>>(
final override var type: ConeKotlinType = type final override var type: ConeKotlinType = type
private set private set
var implicitScope: FirScope? = type.scope(useSiteSession, scopeSession) var implicitScope: FirTypeScope? = type.scope(useSiteSession, scopeSession)
private set private set
override fun scope(useSiteSession: FirSession, scopeSession: ScopeSession): FirScope? = implicitScope override fun scope(useSiteSession: FirSession, scopeSession: ScopeSession): FirTypeScope? = implicitScope
private val originalReceiverExpression: FirThisReceiverExpression = receiverExpression(boundSymbol, type) private val originalReceiverExpression: FirThisReceiverExpression = receiverExpression(boundSymbol, type)
final override var receiverExpression: FirExpression = originalReceiverExpression final override var receiverExpression: FirExpression = originalReceiverExpression
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
+2 -1
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.fir.declarations.isStatic import org.jetbrains.kotlin.fir.declarations.isStatic
import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.buildSyntheticProperty
import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.scopes.FirTypeScope
import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.fir.scopes.processOverriddenFunctionsAndSelf import org.jetbrains.kotlin.fir.scopes.processOverriddenFunctionsAndSelf
import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.CallableId
@@ -35,7 +36,7 @@ class FirSyntheticFunctionSymbol(
class FirSyntheticPropertiesScope( class FirSyntheticPropertiesScope(
val session: FirSession, val session: FirSession,
private val baseScope: FirScope private val baseScope: FirTypeScope
) : FirScope() { ) : FirScope() {
private fun checkGetAndCreateSynthetic( private fun checkGetAndCreateSynthetic(
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScope.kt
+1 -1
View File
@@ -66,7 +66,7 @@ abstract class FirScope {
} }
} }
fun FirScope.processOverriddenFunctionsAndSelf( fun FirTypeScope.processOverriddenFunctionsAndSelf(
functionSymbol: FirFunctionSymbol<*>, functionSymbol: FirFunctionSymbol<*>,
processor: (FirFunctionSymbol<*>) -> ProcessorAction processor: (FirFunctionSymbol<*>) -> ProcessorAction
): ProcessorAction { ): ProcessorAction {