More correct and simple

This commit is contained in:
Valentin Kipyatkov
2015-06-11 16:21:00 +03:00
parent 2ab86192c3
commit 99001f0fe2
@@ -39,7 +39,6 @@ public class WritableScopeImpl(override val workerScope: JetScope,
: AbstractScopeAdapter(), WritableScope {
private val explicitlyAddedDescriptors = SmartList<DeclarationDescriptor>()
private val ownDeclaredDescriptors = ArrayList<DeclarationDescriptor>()
private var functionGroups: SetMultimap<Name, FunctionDescriptor>? = null
@@ -122,7 +121,6 @@ public class WritableScopeImpl(override val workerScope: JetScope,
variableOrClassDescriptors!!.put(name, descriptor)
explicitlyAddedDescriptors.add(descriptor)
ownDeclaredDescriptors.add(descriptor)
}
override fun addVariableDescriptor(variableDescriptor: VariableDescriptor) {
@@ -206,7 +204,7 @@ public class WritableScopeImpl(override val workerScope: JetScope,
super<AbstractScopeAdapter>.getImplicitReceiversHierarchy()
}
override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> = ownDeclaredDescriptors
override fun getOwnDeclaredDescriptors(): Collection<DeclarationDescriptor> = explicitlyAddedDescriptors
override fun toString(): String {
return javaClass.getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + " " + debugName + " for " + getContainingDeclaration()