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

Replace function MemberScope.getContainingDeclaration() to property ownerDescriptor

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-11-04 15:29:33 +03:00
parent 52dc23012f
commit c4582d0e0c
32 changed files with 86 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+3 -2
View File
@@ -116,7 +116,8 @@ public abstract class DeserializedMemberScope protected constructor(
protected abstract fun addClassDescriptors(result: MutableCollection<DeclarationDescriptor>, nameFilter: (Name) -> Boolean)
override fun getContainingDeclaration() = c.containingDeclaration
override val ownerDescriptor: DeclarationDescriptor
get() = c.containingDeclaration
protected fun computeDescriptors(
kindFilter: DescriptorKindFilter,
@@ -179,7 +180,7 @@ public abstract class DeserializedMemberScope protected constructor(
p.println(javaClass.simpleName, " {")
p.pushIndent()
p.println("containingDeclaration = " + getContainingDeclaration())
p.println("containingDeclaration = " + ownerDescriptor)
p.popIndent()
p.println("}")