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

working on REPL: implemented previous lines importing

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-08 04:19:24 +04:00
parent c580a75f20
commit 6946abbcea
17 changed files with 414 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/CodegenContext.java
+1 -1
View File
@@ -134,7 +134,7 @@ public abstract class CodegenContext {
}
public CodegenContext intoScript(@NotNull ScriptDescriptor script, @NotNull ClassDescriptor classDescriptor) {
return new CodegenContexts.ScriptContext(classDescriptor, OwnerKind.IMPLEMENTATION, this, closure);
return new CodegenContexts.ScriptContext(script, classDescriptor, OwnerKind.IMPLEMENTATION, this, closure);
}
public CodegenContexts.ClosureContext intoClosure(FunctionDescriptor funDescriptor, ClassDescriptor classDescriptor, JvmClassName internalClassName, ClosureCodegen closureCodegen, JetTypeMapper typeMapper) {
compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java
+20 -1
View File
@@ -26,6 +26,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.name.Name;
@@ -111,8 +112,17 @@ public class CodegenContexts {
}
public static class MethodContext extends ReceiverContext {
public MethodContext(FunctionDescriptor contextType, OwnerKind contextKind, CodegenContext parentContext) {
@NotNull
private final FunctionDescriptor functionDescriptor;
public MethodContext(@NotNull FunctionDescriptor contextType, OwnerKind contextKind, CodegenContext parentContext) {
super(contextType instanceof PropertyAccessorDescriptor ? ((PropertyAccessorDescriptor)contextType).getCorrespondingProperty() : contextType, contextKind, parentContext, null);
this.functionDescriptor = contextType;
}
@NotNull
public FunctionDescriptor getFunctionDescriptor() {
return functionDescriptor;
}
@Override
@@ -167,8 +177,11 @@ public class CodegenContexts {
@NotNull
private final ClassDescriptor classDescriptor;
@NotNull
private final ScriptDescriptor scriptDescriptor;
public ScriptContext(
@NotNull ScriptDescriptor scriptDescriptor,
@NotNull ClassDescriptor contextDescriptor,
@NotNull OwnerKind contextKind,
@Nullable CodegenContext parentContext,
@@ -176,6 +189,7 @@ public class CodegenContexts {
super(contextDescriptor, contextKind, parentContext, closureCodegen);
this.classDescriptor = contextDescriptor;
this.scriptDescriptor = scriptDescriptor;
}
@Override
@@ -183,6 +197,11 @@ public class CodegenContexts {
return classDescriptor;
}
@NotNull
public ScriptDescriptor getScriptDescriptor() {
return scriptDescriptor;
}
@Override
public boolean isStatic() {
return true;
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+40 -4
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.tree.IElementType;
import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethod;
@@ -1469,10 +1470,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
StackValue.onStack(exprType).put(type, v);
}
else if (descriptor instanceof ScriptReceiver) {
ScriptReceiver scriptReceiver = (ScriptReceiver) descriptor;
ScriptDescriptor script = (ScriptDescriptor) scriptReceiver.getDeclarationDescriptor();
ClassDescriptor classDescriptorForScript = state.getInjector().getClosureAnnotator().classDescriptorForScrpitDescriptor(script);
generateThisOrOuter(classDescriptorForScript);
generateScript((ScriptReceiver) descriptor);
}
else if(descriptor instanceof ExtensionReceiver) {
Type exprType = asmType(descriptor.getType());
@@ -1520,6 +1518,44 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
return castToRequiredTypeOfInterfaceIfNeeded(result, provided, null);
}
private void generateScript(@NotNull ScriptReceiver receiver) {
CodegenContext cur = context;
//PsiElement psiElement = BindingContextUtils.classDescriptorToDeclaration(bindingContext, calleeContainingClass);
//boolean isObject = psiElement instanceof JetClassOrObject && CodegenUtil.isNonLiteralObject((JetClassOrObject) psiElement);
cur = context;
StackValue result = StackValue.local(0, TYPE_OBJECT);
while (cur != null) {
if(cur instanceof CodegenContexts.MethodContext && !(cur instanceof CodegenContexts.ConstructorContext))
cur = cur.getParentContext();
if (cur instanceof CodegenContexts.ScriptContext) {
CodegenContexts.ScriptContext scriptContext = (CodegenContexts.ScriptContext) cur;
JvmClassName currentScriptClassName = state.getInjector().getClosureAnnotator().classNameForScriptDescriptor(scriptContext.getScriptDescriptor());
if (scriptContext.getScriptDescriptor() == receiver.getDeclarationDescriptor()) {
result.put(currentScriptClassName.getAsmType(), v);
}
else {
JvmClassName className = state.getInjector().getClosureAnnotator().classNameForScriptDescriptor(receiver.getDeclarationDescriptor());
String fieldName = state.getInjector().getScriptCodegen().getScriptFieldName(receiver.getDeclarationDescriptor());
result.put(currentScriptClassName.getAsmType(), v);
StackValue.field(className.getAsmType(), currentScriptClassName, fieldName, false).put(className.getAsmType(), v);
}
return;
}
result = cur.getOuterExpression(result);
if(cur instanceof CodegenContexts.ConstructorContext) {
cur = cur.getParentContext();
}
cur = cur.getParentContext();
}
throw new UnsupportedOperationException(); }
public StackValue generateThisOrOuter(ClassDescriptor calleeContainingClass) {
CodegenContext cur = context;
compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
+22
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.di.InjectorForJvmCodegen;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
@@ -40,6 +41,7 @@ import org.jetbrains.jet.utils.Progress;
import org.objectweb.asm.commons.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -145,6 +147,8 @@ public class GenerationState {
}
}
injector.getScriptCodegen().registerEarlierScripts(Collections.<Pair<ScriptDescriptor, JvmClassName>>emptyList());
MultiMap<FqName, JetFile> namespaceGrouping = new MultiMap<FqName, JetFile>();
for (JetFile file : this.files) {
if (file == null) throw new IllegalArgumentException("A null file given for compilation");
@@ -156,6 +160,24 @@ public class GenerationState {
}
}
public void compileScript(
@NotNull JetScript script,
@NotNull JvmClassName className,
@NotNull List<Pair<ScriptDescriptor, JvmClassName>> earlierScripts,
@NotNull CompilationErrorHandler errorHandler) {
poison();
injector.getScriptCodegen().registerEarlierScripts(earlierScripts);
injector.getClosureAnnotator().registerClassNameForScript(script, className);
generateNamespace(
JetPsiUtil.getFQName((JetFile) script.getContainingFile()),
Collections.singleton((JetFile) script.getContainingFile()),
errorHandler,
progress);
}
protected void generateNamespace(FqName fqName, Collection<JetFile> namespace, CompilationErrorHandler errorHandler, Progress progress) {
NamespaceCodegen codegen = forNamespace(fqName, namespace);
codegen.generate(errorHandler, progress);
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+7 -1
View File
@@ -899,13 +899,19 @@ public class JetTypeMapper {
}
@NotNull
public JvmMethodSignature mapScriptSignature(@NotNull ScriptDescriptor script) {
public JvmMethodSignature mapScriptSignature(@NotNull ScriptDescriptor script, @NotNull List<ScriptDescriptor> importedScripts) {
BothSignatureWriter signatureWriter = new BothSignatureWriter(BothSignatureWriter.Mode.METHOD, false);
writeFormalTypeParameters(Collections.<TypeParameterDescriptor>emptyList(), signatureWriter);
signatureWriter.writeParametersStart();
for (ScriptDescriptor importedScript : importedScripts) {
signatureWriter.writeParameterType(JvmMethodParameterKind.VALUE);
mapType(closureAnnotator.classDescriptorForScrpitDescriptor(importedScript).getDefaultType(), signatureWriter, MapTypeMode.VALUE);
signatureWriter.writeParameterTypeEnd();
}
for (ValueParameterDescriptor valueParameter : script.getValueParameters()) {
signatureWriter.writeParameterType(JvmMethodParameterKind.VALUE);
mapType(valueParameter.getType(), signatureWriter, MapTypeMode.VALUE);
compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+60 -3
View File
@@ -16,6 +16,8 @@
package org.jetbrains.jet.codegen;
import com.google.common.collect.Lists;
import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.codegen.signature.JvmMethodSignature;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -33,6 +35,8 @@ import org.objectweb.asm.Type;
import org.objectweb.asm.commons.InstructionAdapter;
import javax.inject.Inject;
import java.util.Collections;
import java.util.List;
/**
* @author Stepan Koltsov
@@ -56,6 +60,8 @@ public class ScriptCodegen {
@NotNull
private BindingContext bindingContext;
private List<ScriptDescriptor> earlierScripts;
@Inject
public void setState(@NotNull GenerationState state) {
@@ -110,7 +116,8 @@ public class ScriptCodegen {
genMembers(scriptDeclaration, context, classBuilder);
genFieldsForParameters(scriptDescriptor, classBuilder);
genConstructor(scriptDeclaration, scriptDescriptor, classDescriptorForScript, classBuilder, context.intoFunction(scriptDescriptor.getScriptCodeDescriptor()));
genConstructor(scriptDeclaration, scriptDescriptor, classDescriptorForScript, classBuilder,
context.intoFunction(scriptDescriptor.getScriptCodeDescriptor()), earlierScripts);
classBuilder.done();
}
@@ -119,13 +126,15 @@ public class ScriptCodegen {
@NotNull JetScript scriptDeclaration,
@NotNull ScriptDescriptor scriptDescriptor,
@NotNull ClassDescriptor classDescriptorForScript,
@NotNull ClassBuilder classBuilder, @NotNull CodegenContext context) {
@NotNull ClassBuilder classBuilder,
@NotNull CodegenContext context,
@NotNull List<ScriptDescriptor> importedScripts) {
Type blockType = jetTypeMapper.mapType(scriptDescriptor.getReturnType(), MapTypeMode.VALUE);
classBuilder.newField(null, Opcodes.ACC_PUBLIC, LAST_EXPRESSION_VALUE_FIELD_NAME, blockType.getDescriptor(), null, null);
JvmMethodSignature jvmSignature = jetTypeMapper.mapScriptSignature(scriptDescriptor);
JvmMethodSignature jvmSignature = jetTypeMapper.mapScriptSignature(scriptDescriptor, importedScripts);
state.setScriptConstructorMethod(jvmSignature.getAsmMethod());
@@ -145,6 +154,10 @@ public class ScriptCodegen {
FrameMap frameMap = context.prepareFrame(jetTypeMapper);
for (ScriptDescriptor importedScript : importedScripts) {
frameMap.enter(importedScript, 1);
}
Type[] argTypes = jvmSignature.getAsmMethod().getArgumentTypes();
int add = 0;
@@ -161,6 +174,15 @@ public class ScriptCodegen {
jetTypeMapper);
int offset = 1;
for (ScriptDescriptor earlierScript : importedScripts) {
JvmClassName earlierClassName = closureAnnotator.classNameForScriptDescriptor(earlierScript);
instructionAdapter.load(0, className.getAsmType());
instructionAdapter.load(offset, earlierClassName.getAsmType());
offset += earlierClassName.getAsmType().getSize();
instructionAdapter.putfield(className.getInternalName(), getScriptFieldName(earlierScript), earlierClassName.getAsmType().getDescriptor());
}
for (ValueParameterDescriptor parameter : scriptDescriptor.getValueParameters()) {
Type parameterType = jetTypeMapper.mapType(parameter.getType(), MapTypeMode.VALUE);
instructionAdapter.load(0, className.getAsmType());
@@ -181,6 +203,12 @@ public class ScriptCodegen {
}
private void genFieldsForParameters(@NotNull ScriptDescriptor script, @NotNull ClassBuilder classBuilder) {
for (ScriptDescriptor earlierScript : earlierScripts) {
JvmClassName earlierClassName = closureAnnotator.classNameForScriptDescriptor(earlierScript);
int access = Opcodes.ACC_PRIVATE | Opcodes.ACC_FINAL;
classBuilder.newField(null, access, getScriptFieldName(earlierScript), earlierClassName.getDescriptor(), null, null);
}
for (ValueParameterDescriptor parameter : script.getValueParameters()) {
Type parameterType = jetTypeMapper.mapType(parameter.getType(), MapTypeMode.VALUE);
int access = Opcodes.ACC_PRIVATE | Opcodes.ACC_FINAL;
@@ -193,4 +221,33 @@ public class ScriptCodegen {
memberCodegen.generateFunctionOrProperty((JetTypeParameterListOwner) decl, context, classBuilder);
}
}
public void registerEarlierScripts(List<Pair<ScriptDescriptor, JvmClassName>> earlierScripts) {
for (Pair<ScriptDescriptor, JvmClassName> t : earlierScripts) {
ScriptDescriptor earlierDescriptor = t.first;
JvmClassName earlierClassName = t.second;
closureAnnotator.registerClassNameForScript(earlierDescriptor, earlierClassName);
}
List<ScriptDescriptor> earlierScriptDescriptors = Lists.newArrayList();
for (Pair<ScriptDescriptor, JvmClassName> t : earlierScripts) {
ScriptDescriptor earlierDescriptor = t.first;
JvmClassName earlierClassName = t.second;
earlierScriptDescriptors.add(earlierDescriptor);
}
this.earlierScripts = earlierScriptDescriptors;
}
public int getScriptIndex(@NotNull ScriptDescriptor scriptDescriptor) {
int index = earlierScripts.indexOf(scriptDescriptor);
if (index < 0) {
throw new IllegalStateException("Unregistered script: " + scriptDescriptor);
}
return index + 1;
}
public String getScriptFieldName(@NotNull ScriptDescriptor scriptDescriptor) {
return "script$" + getScriptIndex(scriptDescriptor);
}
}