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

Introduce ClassDescriptor#getDefaultObjectDescriptor()

Browse Source 
ClassDescriptor#getClassObjectDescriptor (with old semantics) is now a utility
Process usages and replace with calls to a new method where appropriate
This commit is contained in:
Pavel V. Talanov
2015-01-30 15:33:09 +03:00
parent 945072a129
commit f482768acf
26 changed files with 68 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+2 -2
View File
@@ -130,8 +130,8 @@ public class DescriptorSerializer {
}
}
ClassDescriptor classObject = classDescriptor.getClassObjectDescriptor();
if (classObject != null && isClassObject(classObject)) {
ClassDescriptor classObject = classDescriptor.getDefaultObjectDescriptor();
if (classObject != null) {
builder.setClassObjectName(stringTable.getSimpleNameIndex(classObject.getName()));
}
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+1 -4
View File
@@ -110,16 +110,13 @@ public class DeserializedClassDescriptor(
}
private fun computeClassObjectDescriptor(): ClassDescriptor? {
if (getKind() == ClassKind.OBJECT || getKind() == ClassKind.CLASS_OBJECT) {
return this
}
if (!classProto.hasClassObjectName()) return null
val classObjectName = c.nameResolver.getName(classProto.getClassObjectName())
return memberScope.getClassifier(classObjectName) as? ClassDescriptor
}
override fun getClassObjectDescriptor(): ClassDescriptor? = classObjectDescriptor()
override fun getDefaultObjectDescriptor(): ClassDescriptor? = classObjectDescriptor()
private fun computeSuperTypes(): Collection<JetType> {
val supertypes = ArrayList<JetType>(classProto.getSupertypeCount())