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

[FIR] Use proper collections for override scope

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-06-10 16:39:20 +03:00
committed by Mikhail Glukhikh
parent 321e948eca
commit f88fafea9d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSuperTypeScope.kt
+4 -4
View File
@@ -19,8 +19,8 @@ class FirSuperTypeScope(
) : AbstractFirOverrideScope(session) { ) : AbstractFirOverrideScope(session) {
override fun processFunctionsByName(name: Name, processor: (ConeFunctionSymbol) -> ProcessorAction): ProcessorAction { override fun processFunctionsByName(name: Name, processor: (ConeFunctionSymbol) -> ProcessorAction): ProcessorAction {
val accepted = mutableSetOf<ConeFunctionSymbol>() val accepted = HashSet<ConeFunctionSymbol>()
val pending = mutableSetOf<ConeFunctionSymbol>() val pending = mutableListOf<ConeFunctionSymbol>()
for (scope in scopes) { for (scope in scopes) {
if (scope.processFunctionsByName(name) { if (scope.processFunctionsByName(name) {
@@ -41,8 +41,8 @@ class FirSuperTypeScope(
} }
override fun processPropertiesByName(name: Name, processor: (ConeVariableSymbol) -> ProcessorAction): ProcessorAction { override fun processPropertiesByName(name: Name, processor: (ConeVariableSymbol) -> ProcessorAction): ProcessorAction {
val accepted = mutableSetOf<ConeCallableSymbol>() val accepted = HashSet<ConeCallableSymbol>()
val pending = mutableSetOf<ConeVariableSymbol>() val pending = mutableListOf<ConeVariableSymbol>()
for (scope in scopes) { for (scope in scopes) {
if (scope.processPropertiesByName(name) { if (scope.processPropertiesByName(name) {
if (it !in accepted && it.isOverridden(accepted) == null) { if (it !in accepted && it.isOverridden(accepted) == null) {