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

default -> companion: Replace some missed usages of "isDefault"

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-17 17:10:00 +03:00
parent 3ec6ffc906
commit a50b218c6a
17 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+2 -2
View File
@@ -48,7 +48,7 @@ public class DeserializedClassDescriptor(
private val visibility = deserialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
private val kindFromProto = Flags.CLASS_KIND.get(classProto.getFlags())
private val kind = deserialization.classKind(kindFromProto)
private val isDefault = kindFromProto == ProtoBuf.Class.Kind.CLASS_OBJECT
private val isCompanion = kindFromProto == ProtoBuf.Class.Kind.CLASS_OBJECT
private val isInner = Flags.INNER.get(classProto.getFlags())
val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver)
@@ -92,7 +92,7 @@ public class DeserializedClassDescriptor(
override fun getStaticScope() = staticScope
override fun isCompanionObject(): Boolean = isDefault
override fun isCompanionObject(): Boolean = isCompanion
private fun computePrimaryConstructor(): ConstructorDescriptor? {
if (!classProto.hasPrimaryConstructor()) return null