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

[FIR] Add substitution to classifiers processing

Browse Source
This commit is contained in:
simon.ogorodnik
2020-04-09 22:16:54 +03:00
parent cd4a7a25c3
commit d55c6550bb
21 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirIterableScope.kt
+4 -3
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.scopes
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.symbols.impl.FirClassifierSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
@@ -13,12 +14,12 @@ import org.jetbrains.kotlin.name.Name
abstract class FirIterableScope : FirScope() {
abstract val scopes: Iterable<FirScope>
override fun processClassifiersByName(
override fun processClassifiersByNameWithSubstitution(
name: Name,
processor: (FirClassifierSymbol<*>) -> Unit
processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit
) {
for (scope in scopes) {
scope.processClassifiersByName(name, processor)
scope.processClassifiersByNameWithSubstitution(name, processor)
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirScope.kt
+11 -2
View File
@@ -5,15 +5,16 @@
package org.jetbrains.kotlin.fir.scopes
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.symbols.impl.FirClassifierSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
import org.jetbrains.kotlin.name.Name
abstract class FirScope {
open fun processClassifiersByName(
open fun processClassifiersByNameWithSubstitution(
name: Name,
processor: (FirClassifierSymbol<*>) -> Unit
processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit
) {}
open fun processFunctionsByName(
@@ -48,3 +49,11 @@ enum class ProcessorAction {
return this
}
}
inline fun FirScope.processClassifiersByName(
name: Name,
noinline processor: (FirClassifierSymbol<*>) -> Unit
) {
processClassifiersByNameWithSubstitution(name) { symbol, _ -> processor(symbol) }
}