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

Deserialize expected this objects

Browse Source
This commit is contained in:
Andrey Breslav
2013-06-04 13:53:41 +04:00
committed by Alexander Udalov
parent ece3684622
commit ae9950d88d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+9 -4
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.descriptors.serialization;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.Modality;
@@ -113,8 +114,7 @@ public class DescriptorDeserializer {
property.setType(
local.typeDeserializer.type(proto.getReturnType()),
typeParameters,
// TODO: expected this object
null,
getExpectedThisObject(),
local.typeDeserializer.typeOrNull(proto.hasReceiverType() ? proto.getReceiverType() : null)
);
return property;
@@ -133,8 +133,7 @@ public class DescriptorDeserializer {
List<TypeParameterDescriptor> typeParameters = local.typeParameters(proto.getTypeParametersList());
function.initialize(
local.typeDeserializer.typeOrNull(proto.hasReceiverType() ? proto.getReceiverType() : null),
// TODO: expectedThisObject
null,
getExpectedThisObject(),
typeParameters,
local.valueParameters(proto.getValueParametersList()),
local.typeDeserializer.type(proto.getReturnType()),
@@ -146,6 +145,12 @@ public class DescriptorDeserializer {
return function;
}
@Nullable
private ReceiverParameterDescriptor getExpectedThisObject() {
return containingDeclaration instanceof ClassDescriptor
? ((ClassDescriptor) containingDeclaration).getThisAsReceiverParameter() : null;
}
@NotNull
private CallableMemberDescriptor loadConstructor(@NotNull Callable proto) {
ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration;