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

Minor, inline DescriptorUtils.getEnumEntriesScope

Browse Source
This commit is contained in:
Alexander Udalov
2013-11-22 23:20:23 +04:00
parent 8549cbb510
commit dcedbed7e1
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
+2 -1
View File
@@ -132,7 +132,8 @@ public class DescriptorSerializer {
}
if (classDescriptor.getKind() == ClassKind.ENUM_CLASS) {
for (DeclarationDescriptor descriptor : getEnumEntriesScope(classDescriptor).getAllDescriptors()) {
// Not calling sort() here, because the order of enum entries matters
for (DeclarationDescriptor descriptor : nestedClasses) {
if (isEnumEntry(descriptor)) {
builder.addEnumEntry(nameTable.getSimpleNameIndex(descriptor.getName()));
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/WhenChecker.java
+1 -2
View File
@@ -27,7 +27,6 @@ import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getEnumEntriesScope;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry;
public final class WhenChecker {
@@ -54,7 +53,7 @@ public final class WhenChecker {
if (classDescriptor.getKind() != ClassKind.ENUM_CLASS || classDescriptor.getModality().isOverridable()) return false;
boolean isExhaust = true;
boolean notEmpty = false;
for (DeclarationDescriptor descriptor : getEnumEntriesScope(classDescriptor).getAllDescriptors()) {
for (DeclarationDescriptor descriptor : classDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors()) {
if (isEnumEntry(descriptor)) {
notEmpty = true;
if (!containsEnumEntryCase(expression, (ClassDescriptor) descriptor, trace)) {