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

rename FunctionDescriptorImpl.receiver

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-05 22:56:24 +04:00
parent e7a81bb466
commit 4cf48d64a7
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java
+10 -10
View File
@@ -44,7 +44,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorImpl i
protected List<TypeParameterDescriptor> typeParameters; protected List<TypeParameterDescriptor> typeParameters;
protected List<ValueParameterDescriptor> unsubstitutedValueParameters; protected List<ValueParameterDescriptor> unsubstitutedValueParameters;
protected JetType unsubstitutedReturnType; protected JetType unsubstitutedReturnType;
private ReceiverDescriptor receiver; private ReceiverDescriptor receiverParameter;
protected ReceiverDescriptor expectedThisObject; protected ReceiverDescriptor expectedThisObject;
protected Modality modality; protected Modality modality;
@@ -75,7 +75,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorImpl i
} }
protected FunctionDescriptorImpl initialize( protected FunctionDescriptorImpl initialize(
@Nullable JetType receiverType, @Nullable JetType receiverParameterType,
@NotNull ReceiverDescriptor expectedThisObject, @NotNull ReceiverDescriptor expectedThisObject,
@NotNull List<? extends TypeParameterDescriptor> typeParameters, @NotNull List<? extends TypeParameterDescriptor> typeParameters,
@NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters, @NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters,
@@ -87,7 +87,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorImpl i
this.unsubstitutedReturnType = unsubstitutedReturnType; this.unsubstitutedReturnType = unsubstitutedReturnType;
this.modality = modality; this.modality = modality;
this.visibility = visibility; this.visibility = visibility;
this.receiver = receiverType == null ? NO_RECEIVER : new ExtensionReceiver(this, receiverType); this.receiverParameter = receiverParameterType == null ? NO_RECEIVER : new ExtensionReceiver(this, receiverParameterType);
this.expectedThisObject = expectedThisObject; this.expectedThisObject = expectedThisObject;
for (int i = 0; i < typeParameters.size(); ++i) { for (int i = 0; i < typeParameters.size(); ++i) {
@@ -98,7 +98,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorImpl i
for (int i = 0; i < unsubstitutedValueParameters.size(); ++i) { for (int i = 0; i < unsubstitutedValueParameters.size(); ++i) {
// TODO fill me // TODO fill me
int firstValueParameterOffset = 0; // receiver.exists() ? 1 : 0; int firstValueParameterOffset = 0; // receiverParameter.exists() ? 1 : 0;
ValueParameterDescriptor valueParameterDescriptor = unsubstitutedValueParameters.get(i); ValueParameterDescriptor valueParameterDescriptor = unsubstitutedValueParameters.get(i);
if (valueParameterDescriptor.getIndex() != i + firstValueParameterOffset) { if (valueParameterDescriptor.getIndex() != i + firstValueParameterOffset) {
throw new IllegalStateException(valueParameterDescriptor + "index is " + valueParameterDescriptor.getIndex() + " but position is " + i); throw new IllegalStateException(valueParameterDescriptor + "index is " + valueParameterDescriptor.getIndex() + " but position is " + i);
@@ -119,7 +119,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorImpl i
@NotNull @NotNull
@Override @Override
public ReceiverDescriptor getReceiverParameter() { public ReceiverDescriptor getReceiverParameter() {
return receiver; return receiverParameter;
} }
@NotNull @NotNull
@@ -194,10 +194,10 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorImpl i
List<TypeParameterDescriptor> substitutedTypeParameters = Lists.newArrayList(); List<TypeParameterDescriptor> substitutedTypeParameters = Lists.newArrayList();
TypeSubstitutor substitutor = DescriptorSubstitutor.substituteTypeParameters(getTypeParameters(), originalSubstitutor, substitutedDescriptor, substitutedTypeParameters); TypeSubstitutor substitutor = DescriptorSubstitutor.substituteTypeParameters(getTypeParameters(), originalSubstitutor, substitutedDescriptor, substitutedTypeParameters);
JetType substitutedReceiverType = null; JetType substitutedReceiverParameterType = null;
if (receiver.exists()) { if (receiverParameter.exists()) {
substitutedReceiverType = substitutor.substitute(getReceiverParameter().getType(), Variance.IN_VARIANCE); substitutedReceiverParameterType = substitutor.substitute(getReceiverParameter().getType(), Variance.IN_VARIANCE);
if (substitutedReceiverType == null) { if (substitutedReceiverParameterType == null) {
return null; return null;
} }
} }
@@ -222,7 +222,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorImpl i
} }
substitutedDescriptor.initialize( substitutedDescriptor.initialize(
substitutedReceiverType, substitutedReceiverParameterType,
substitutedExpectedThis, substitutedExpectedThis,
substitutedTypeParameters, substitutedTypeParameters,
substitutedValueParameters, substitutedValueParameters,
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptorImpl.java
+2 -2
View File
@@ -52,7 +52,7 @@ public class SimpleFunctionDescriptorImpl extends FunctionDescriptorImpl impleme
} }
public SimpleFunctionDescriptorImpl initialize( public SimpleFunctionDescriptorImpl initialize(
@Nullable JetType receiverType, @Nullable JetType receiverParameterType,
@NotNull ReceiverDescriptor expectedThisObject, @NotNull ReceiverDescriptor expectedThisObject,
@NotNull List<? extends TypeParameterDescriptor> typeParameters, @NotNull List<? extends TypeParameterDescriptor> typeParameters,
@NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters, @NotNull List<ValueParameterDescriptor> unsubstitutedValueParameters,
@@ -60,7 +60,7 @@ public class SimpleFunctionDescriptorImpl extends FunctionDescriptorImpl impleme
@Nullable Modality modality, @Nullable Modality modality,
@NotNull Visibility visibility, @NotNull Visibility visibility,
boolean isInline) { boolean isInline) {
super.initialize(receiverType, expectedThisObject, typeParameters, unsubstitutedValueParameters, unsubstitutedReturnType, modality, visibility); super.initialize(receiverParameterType, expectedThisObject, typeParameters, unsubstitutedValueParameters, unsubstitutedReturnType, modality, visibility);
this.isInline = isInline; this.isInline = isInline;
return this; return this;
} }