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

FirClassDeclaredMemberScope: rewrite index calculation imperatively

Browse Source 
This should save some performance at this point
This commit is contained in:
Mikhail Glukhikh
2019-05-31 14:35:21 +03:00
parent 8ae77da250
commit 73a6714ad1
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
+22 -7
View File
@@ -5,7 +5,8 @@
package org.jetbrains.kotlin.fir.scopes.impl package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
import org.jetbrains.kotlin.fir.declarations.FirConstructor
import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.scopes.FirPosition import org.jetbrains.kotlin.fir.scopes.FirPosition
import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.FirScope
@@ -13,16 +14,30 @@ import org.jetbrains.kotlin.fir.scopes.ProcessorAction
import org.jetbrains.kotlin.fir.scopes.ProcessorAction.NEXT import org.jetbrains.kotlin.fir.scopes.ProcessorAction.NEXT
import org.jetbrains.kotlin.fir.scopes.ProcessorAction.STOP import org.jetbrains.kotlin.fir.scopes.ProcessorAction.STOP
import org.jetbrains.kotlin.fir.symbols.* import org.jetbrains.kotlin.fir.symbols.*
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
class FirClassDeclaredMemberScope(klass: FirRegularClass) : FirScope { class FirClassDeclaredMemberScope(klass: FirRegularClass) : FirScope {
private val callablesIndex by lazy { private val callablesIndex: Map<Name, List<FirCallableSymbol>> by lazy {
klass.declarations.filterIsInstance<FirCallableDeclaration>() val result = mutableMapOf<Name, MutableList<FirCallableSymbol>>()
.map { it.symbol }.groupBy { it.callableId.callableName } for (declaration in klass.declarations) {
if (declaration is FirCallableMemberDeclaration) {
val name = if (declaration is FirConstructor) klass.name else declaration.name
val list = result.getOrPut(name) { mutableListOf() }
list += declaration.symbol
}
}
result
} }
private val classIndex by lazy { private val classIndex: Map<Name, FirClassSymbol> by lazy {
klass.declarations.filterIsInstance<FirRegularClass>() val result = mutableMapOf<Name, FirClassSymbol>()
.map { it.symbol }.associateBy { it.fir.name } for (declaration in klass.declarations) {
if (declaration is FirRegularClass) {
result[declaration.name] = declaration.symbol
}
}
result
} }
override fun processFunctionsByName(name: Name, processor: (ConeFunctionSymbol) -> ProcessorAction): ProcessorAction { override fun processFunctionsByName(name: Name, processor: (ConeFunctionSymbol) -> ProcessorAction): ProcessorAction {