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

Removed usages KtScope.getAllDescriptors

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-11-02 16:07:19 +03:00
parent 21fdd2ffc3
commit 0b5de434fa
37 changed files with 82 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java
+1 -1
View File
@@ -67,7 +67,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen<KtClassOrObject> {
}
if (!DescriptorUtils.isInterface(descriptor)) {
for (DeclarationDescriptor memberDescriptor : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
for (DeclarationDescriptor memberDescriptor : DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope())) {
if (memberDescriptor instanceof CallableMemberDescriptor) {
CallableMemberDescriptor member = (CallableMemberDescriptor) memberDescriptor;
if (!member.getKind().isReal() && ImplKt.findTraitImplementation(member) == null) {
compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt
+1 -1
View File
@@ -74,7 +74,7 @@ public class InterfaceImplBodyCodegen(
}
override fun generateSyntheticParts() {
for (memberDescriptor in descriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
for (memberDescriptor in descriptor.getDefaultType().getMemberScope().getDescriptors()) {
if (memberDescriptor !is CallableMemberDescriptor) continue
if (memberDescriptor.getKind().isReal()) continue
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class JvmCodegenUtil {
}
public static boolean hasAbstractMembers(@NotNull ClassDescriptor classDescriptor) {
return CollectionsKt.any(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors(),
return CollectionsKt.any(DescriptorUtils.getAllDescriptors(classDescriptor.getDefaultType().getMemberScope()),
new Function1<DeclarationDescriptor, Boolean>() {
@Override
public Boolean invoke(DeclarationDescriptor descriptor) {