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

One more simplification

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-11 16:18:11 +03:00
parent 060aeb60e1
commit 2ab86192c3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
+3 -4
View File
@@ -39,7 +39,7 @@ public class WritableScopeImpl(override val workerScope: JetScope,
: AbstractScopeAdapter(), WritableScope { : AbstractScopeAdapter(), WritableScope {
private val explicitlyAddedDescriptors = SmartList<DeclarationDescriptor>() private val explicitlyAddedDescriptors = SmartList<DeclarationDescriptor>()
private val declaredDescriptorsAccessibleBySimpleName = HashMultimap.create<Name, DeclarationDescriptor>() private val ownDeclaredDescriptors = ArrayList<DeclarationDescriptor>()
private var functionGroups: SetMultimap<Name, FunctionDescriptor>? = null private var functionGroups: SetMultimap<Name, FunctionDescriptor>? = null
@@ -122,7 +122,7 @@ public class WritableScopeImpl(override val workerScope: JetScope,
variableOrClassDescriptors!!.put(name, descriptor) variableOrClassDescriptors!!.put(name, descriptor)
explicitlyAddedDescriptors.add(descriptor) explicitlyAddedDescriptors.add(descriptor)
declaredDescriptorsAccessibleBySimpleName.put(name, descriptor) ownDeclaredDescriptors.add(descriptor)
} }
override fun addVariableDescriptor(variableDescriptor: VariableDescriptor) { override fun addVariableDescriptor(variableDescriptor: VariableDescriptor) {
@@ -206,8 +206,7 @@ public class WritableScopeImpl(override val workerScope: JetScope,
super<AbstractScopeAdapter>.getImplicitReceiversHierarchy() super<AbstractScopeAdapter>.getImplicitReceiversHierarchy()
} }
override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> = ownDeclaredDescriptors
= declaredDescriptorsAccessibleBySimpleName.values()
override fun toString(): String { override fun toString(): String {
return javaClass.getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + " " + debugName + " for " + getContainingDeclaration() return javaClass.getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + " " + debugName + " for " + getContainingDeclaration()