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

Fix value parameter indeices for function literals with receivers

Browse Source
This commit is contained in:
Andrey Breslav
2012-02-09 16:00:29 +04:00
parent 255e37efb9
commit b7f5490b4c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java
+3 -2
View File
@@ -76,8 +76,9 @@ 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; // receiver.exists() ? 1 : 0;
if (unsubstitutedValueParameters.get(i).getIndex() != i + firstValueParameterOffset) { ValueParameterDescriptor valueParameterDescriptor = unsubstitutedValueParameters.get(i);
//throw new IllegalStateException(); if (valueParameterDescriptor.getIndex() != i + firstValueParameterOffset) {
throw new IllegalStateException(valueParameterDescriptor + "index is " + valueParameterDescriptor.getIndex() + " but position is " + i);
} }
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardClasses.java
+1 -1
View File
@@ -395,7 +395,7 @@ public class JetStandardClasses {
List<ValueParameterDescriptor> valueParameters = Lists.newArrayList(); List<ValueParameterDescriptor> valueParameters = Lists.newArrayList();
for (int i = first; i <= last; i++) { for (int i = first; i <= last; i++) {
JetType parameterType = arguments.get(i).getType(); JetType parameterType = arguments.get(i).getType();
ValueParameterDescriptorImpl valueParameterDescriptor = new ValueParameterDescriptorImpl(functionDescriptor, i, Collections.<AnnotationDescriptor>emptyList(), "p" + i, false, parameterType, false, null); ValueParameterDescriptorImpl valueParameterDescriptor = new ValueParameterDescriptorImpl(functionDescriptor, i - first, Collections.<AnnotationDescriptor>emptyList(), "p" + i, false, parameterType, false, null);
valueParameters.add(valueParameterDescriptor); valueParameters.add(valueParameterDescriptor);
} }
return valueParameters; return valueParameters;