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

Minor, simplify serialization of enum entries

Browse Source 
Enum entries are never reordered during sort (see MemberComparator)
This commit is contained in:
Alexander Udalov
2014-11-26 15:36:07 +03:00
parent 122b14dd7d
commit fd2ddff750
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
+7 -13
View File
@@ -120,10 +120,13 @@ public class DescriptorSerializer {
} }
} }
Collection<DeclarationDescriptor> nestedClasses = classDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors(); for (DeclarationDescriptor descriptor : sort(classDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors())) {
for (DeclarationDescriptor descriptor : sort(nestedClasses)) { int name = nameTable.getSimpleNameIndex(descriptor.getName());
if (!isEnumEntry(descriptor)) { if (isEnumEntry(descriptor)) {
builder.addNestedClassName(nameTable.getSimpleNameIndex(descriptor.getName())); builder.addEnumEntry(name);
}
else {
builder.addNestedClassName(name);
} }
} }
@@ -132,15 +135,6 @@ public class DescriptorSerializer {
builder.setClassObject(classObjectProto(classObject)); builder.setClassObject(classObjectProto(classObject));
} }
if (classDescriptor.getKind() == ClassKind.ENUM_CLASS) {
// Not calling sort() here, because the order of enum entries matters
for (DeclarationDescriptor descriptor : nestedClasses) {
if (isEnumEntry(descriptor)) {
builder.addEnumEntry(nameTable.getSimpleNameIndex(descriptor.getName()));
}
}
}
return builder; return builder;
} }