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

'isSubclass' method refactoring: not collecting all supertypes

Browse Source
This commit is contained in:
Svetlana Isakova
2012-04-02 13:15:38 +04:00
parent 9d752561eb
commit 3bae350829
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+11 -11
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
@@ -279,20 +278,21 @@ public class DescriptorUtils {
} }
} }
public static boolean isSubclass(ClassDescriptor subClass, ClassDescriptor superClass) { public static boolean isSubclass(@NotNull ClassDescriptor subClass, @NotNull ClassDescriptor superClass) {
Set<JetType> allSuperTypes = new THashSet<JetType>(); DeclarationDescriptor superOriginal = superClass.getOriginal();
return hasEqualSuperType(subClass.getDefaultType(), superOriginal);
}
addSuperTypes(subClass.getDefaultType(), allSuperTypes); private static boolean hasEqualSuperType(@NotNull JetType type, @NotNull DeclarationDescriptor superOriginal) {
DeclarationDescriptor descriptor = type.getConstructor().getDeclarationDescriptor();
final DeclarationDescriptor superOriginal = superClass.getOriginal(); if (descriptor != null && superOriginal.equals(descriptor.getOriginal())) {
return true;
for (JetType superType : allSuperTypes) { }
final DeclarationDescriptor descriptor = superType.getConstructor().getDeclarationDescriptor(); for (JetType superType : type.getConstructor().getSupertypes()) {
if (descriptor != null && superOriginal.equals(descriptor.getOriginal())) { if (hasEqualSuperType(superType, superOriginal)) {
return true; return true;
} }
} }
return false; return false;
} }