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

Fix script codegen for REPL lines with ScriptTemplate with parameters

Browse Source
This commit is contained in:
Ilya Chernikov
2016-09-22 11:35:31 +02:00
parent fe69185cd4
commit f0d2f458e0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java
+4 -2
View File
@@ -152,7 +152,7 @@ public class ScriptCodegen extends MemberCodegen<KtScript> {
iv.invokespecial("java/lang/Object", "<init>", "()V", false); iv.invokespecial("java/lang/Object", "<init>", "()V", false);
} }
else { else {
// TODO: check if it is correct way to find a promary constructor // TODO: check if it is correct way to find a primary constructor
Collection<ClassConstructorDescriptor> ctorDescriptors = superclass.getConstructors(); Collection<ClassConstructorDescriptor> ctorDescriptors = superclass.getConstructors();
assert ctorDescriptors.size() == 1; assert ctorDescriptors.size() == 1;
ConstructorDescriptor ctorDesc = ctorDescriptors.iterator().next(); ConstructorDescriptor ctorDesc = ctorDescriptors.iterator().next();
@@ -160,6 +160,8 @@ public class ScriptCodegen extends MemberCodegen<KtScript> {
iv.load(0, classType); iv.load(0, classType);
int valueParamStart = context.getEarlierScripts().size() + 1;
List<ValueParameterDescriptor> valueParameters = scriptDescriptor.getUnsubstitutedPrimaryConstructor().getValueParameters(); List<ValueParameterDescriptor> valueParameters = scriptDescriptor.getUnsubstitutedPrimaryConstructor().getValueParameters();
for (ValueParameterDescriptor superclassParam: ctorDesc.getValueParameters()) { for (ValueParameterDescriptor superclassParam: ctorDesc.getValueParameters()) {
ValueParameterDescriptor valueParam = null; ValueParameterDescriptor valueParam = null;
@@ -170,7 +172,7 @@ public class ScriptCodegen extends MemberCodegen<KtScript> {
} }
} }
assert valueParam != null; assert valueParam != null;
iv.load(valueParam.getIndex() + 1, typeMapper.mapType(valueParam.getType())); iv.load(valueParam.getIndex() + valueParamStart, typeMapper.mapType(valueParam.getType()));
} }
CallableMethod ctorMethod = typeMapper.mapToCallableMethod(ctorDesc, false); CallableMethod ctorMethod = typeMapper.mapToCallableMethod(ctorDesc, false);