Removed MemberScope.ownerDescriptor

This commit is contained in:
Stanislav Erokhin
2015-11-05 02:16:36 +03:00
parent 22f78b148c
commit 55157df3eb
36 changed files with 61 additions and 155 deletions
@@ -116,9 +116,6 @@ public abstract class DeserializedMemberScope protected constructor(
protected abstract fun addClassDescriptors(result: MutableCollection<DeclarationDescriptor>, nameFilter: (Name) -> Boolean)
override val ownerDescriptor: DeclarationDescriptor
get() = c.containingDeclaration
protected fun computeDescriptors(
kindFilter: DescriptorKindFilter,
nameFilter: (Name) -> Boolean,
@@ -180,13 +177,13 @@ public abstract class DeserializedMemberScope protected constructor(
p.println(javaClass.simpleName, " {")
p.pushIndent()
p.println("containingDeclaration = " + ownerDescriptor)
p.println("containingDeclaration = " + c.containingDeclaration)
p.popIndent()
p.println("}")
}
private fun recordLookup(name: Name, from: LookupLocation) {
c.components.lookupTracker.record(from, ownerDescriptor, this, name)
c.components.lookupTracker.record(from, c.containingDeclaration, this, name)
}
}