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

Make PropertyAccessorDescriptor#hasBody a front-end utility

Browse Source
This commit is contained in:
Alexander Udalov
2016-02-22 19:48:59 +03:00
committed by Alexander Udalov
parent ae14d185eb
commit 4553afbd0c
15 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+4 -6
View File
@@ -40,7 +40,7 @@ class MemberDeserializer(private val c: DeserializationContext) {
Deserialization.modality(Flags.MODALITY.get(flags)),
Deserialization.visibility(Flags.VISIBILITY.get(flags)),
Flags.IS_VAR.get(flags),
c.nameResolver.getName(proto.getName()),
c.nameResolver.getName(proto.name),
Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)),
Flags.IS_LATEINIT.get(flags),
Flags.IS_CONST.get(flags),
@@ -75,16 +75,15 @@ class MemberDeserializer(private val c: DeserializationContext) {
getAnnotations(proto, getterFlags, AnnotatedCallableKind.PROPERTY_GETTER),
Deserialization.modality(Flags.MODALITY.get(getterFlags)),
Deserialization.visibility(Flags.VISIBILITY.get(getterFlags)),
/* hasBody = */ isNotDefault,
/* isDefault = */ !isNotDefault,
/* isExternal = */ isExternal,
property.getKind(), null, SourceElement.NO_SOURCE
property.kind, null, SourceElement.NO_SOURCE
)
}
else {
DescriptorFactory.createDefaultGetter(property, Annotations.EMPTY)
}
getter.initialize(property.getReturnType())
getter.initialize(property.returnType)
getter
}
else {
@@ -101,10 +100,9 @@ class MemberDeserializer(private val c: DeserializationContext) {
getAnnotations(proto, setterFlags, AnnotatedCallableKind.PROPERTY_SETTER),
Deserialization.modality(Flags.MODALITY.get(setterFlags)),
Deserialization.visibility(Flags.VISIBILITY.get(setterFlags)),
/* hasBody = */ isNotDefault,
/* isDefault = */ !isNotDefault,
/* isExternal = */ isExternal,
property.getKind(), null, SourceElement.NO_SOURCE
property.kind, null, SourceElement.NO_SOURCE
)
val setterLocal = local.childContext(setter, listOf())
val valueParameters = setterLocal.memberDeserializer.valueParameters(