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

Marked scripting points with // SCRIPT: markers.

Browse Source
This commit is contained in:
Ilya Ryzhenkov
2014-03-17 23:16:54 +04:00
committed by Andrey Breslav
parent 618aea6218
commit e49f4a0722
26 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+3
View File
@@ -2163,6 +2163,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
}
}
else if (descriptor instanceof ScriptReceiver) {
// SCRIPT: generate script
generateScript((ScriptReceiver) descriptor);
}
else if (descriptor instanceof ExtensionReceiver) {
@@ -2196,6 +2197,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
return context.lookupInContext(provided, StackValue.local(0, OBJECT_TYPE), state, false);
}
// SCRIPT: generate script, move to ScriptingUtil
private void generateScript(@NotNull ScriptReceiver receiver) {
CodegenContext cur = context;
StackValue result = StackValue.local(0, OBJECT_TYPE);
@@ -3222,6 +3224,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
Type varType = asmType(variableDescriptor.getType());
// SCRIPT: Variable at the top of the script is generated as field
if (JetPsiUtil.isScriptDeclaration(variableDeclaration)) {
generateInitializer.fun(variableDescriptor);
JetScript scriptPsi = JetPsiUtil.getScript(variableDeclaration);
compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java
+1
View File
@@ -37,6 +37,7 @@ public class KotlinCodegenFacade {
) {
for (JetFile file : state.getFiles()) {
if (file.isScript()) {
// SCRIPT: register class name for scripting from this file, move outside of this function
String name = ScriptNameUtil.classNameForScript(file);
JetScript script = file.getScript();
assert script != null;
compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
+2
View File
@@ -145,6 +145,7 @@ public class PackageCodegen extends GenerationStateAware {
return;
}
// SCRIPT: Do not write annotations for scripts (if any is??)
for (JetFile file : files) {
if (file.isScript()) return;
}
@@ -184,6 +185,7 @@ public class PackageCodegen extends GenerationStateAware {
}
}
else if (declaration instanceof JetScript) {
// SCRIPT: generate script code, should be separate execution branch
ScriptCodegen.createScriptCodegen((JetScript) declaration, state, packagePartContext).generate();
}
}
compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+1
View File
@@ -40,6 +40,7 @@ import static org.jetbrains.asm4.Opcodes.*;
import static org.jetbrains.jet.codegen.binding.CodegenBinding.*;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
// SCRIPT: script code generator
public class ScriptCodegen extends MemberCodegen {
public static ScriptCodegen createScriptCodegen(
compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
+1
View File
@@ -141,6 +141,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
@Override
public void visitJetFile(@NotNull JetFile file) {
if (file.isScript()) {
// SCRIPT: should be replaced with VisitScript override
//noinspection ConstantConditions
ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_SCRIPT, bindingContext.get(SCRIPT, file.getScript()));
pushClassDescriptor(classDescriptor);
compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java
+5
View File
@@ -79,6 +79,7 @@ public class CodegenBinding {
return Boolean.TRUE.equals(bindingContext.get(ENUM_ENTRY_CLASS_NEED_SUBCLASS, classDescriptor));
}
// SCRIPT: Generate asmType for script, move to ScriptingUtil
@NotNull
public static Type asmTypeForScriptDescriptor(BindingContext bindingContext, @NotNull ScriptDescriptor scriptDescriptor) {
ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_SCRIPT, scriptDescriptor);
@@ -86,6 +87,7 @@ public class CodegenBinding {
return asmType(bindingContext, classDescriptor);
}
// SCRIPT: Generate asmType for script, move to ScriptingUtil
@NotNull
public static Type asmTypeForScriptPsi(BindingContext bindingContext, @NotNull JetScript script) {
ScriptDescriptor scriptDescriptor = bindingContext.get(SCRIPT, script);
@@ -138,6 +140,7 @@ public class CodegenBinding {
return asmType(bindingContext, classDescriptor);
}
// SCRIPT: register asmType for script descriptor, move to ScriptingUtil
public static void registerClassNameForScript(
BindingTrace bindingTrace,
@NotNull ScriptDescriptor scriptDescriptor,
@@ -217,6 +220,7 @@ public class CodegenBinding {
innerClasses.add(inner);
}
// SCRIPT: register asmType for script, move to ScriptingUtil
public static void registerClassNameForScript(
BindingTrace bindingTrace,
@NotNull JetScript jetScript,
@@ -234,6 +238,7 @@ public class CodegenBinding {
// todo: we use Set and add given files but ignoring other scripts because something non-clear kept in binding
// for scripts especially in case of REPL
// SCRIPT: collect fq names for files that are not scripts
HashSet<FqName> names = new HashSet<FqName>();
for (JetFile file : files) {
if (!file.isScript()) {
compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
+1
View File
@@ -197,6 +197,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
return new ConstructorContext(descriptor, getContextKind(), this, closure);
}
// SCRIPT: generate into script, move to ScriptingUtil
@NotNull
public ScriptContext intoScript(@NotNull ScriptDescriptor script, @NotNull ClassDescriptor classDescriptor) {
return new ScriptContext(script, classDescriptor, OwnerKind.IMPLEMENTATION, this, closure);
compiler/backend/src/org/jetbrains/jet/codegen/context/ScriptContext.java
+1
View File
@@ -23,6 +23,7 @@ import org.jetbrains.jet.codegen.binding.MutableClosure;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
// SCRIPT: script as field owner context
public class ScriptContext extends FieldOwnerContext<ClassDescriptor> {
@NotNull
private final ScriptDescriptor scriptDescriptor;
compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java
+2
View File
@@ -146,6 +146,8 @@ public interface JetNodeTypes {
JetNodeType WHEN_CONDITION_EXPRESSION = new JetNodeType("WHEN_CONDITION_WITH_EXPRESSION", JetWhenConditionWithExpression.class);
JetNodeType PACKAGE_DIRECTIVE = new JetNodeType("PACKAGE_DIRECTIVE", JetPackageDirective.class);
// SCRIPT: script node type
JetNodeType SCRIPT = new JetNodeType("SCRIPT", JetScript.class);
IFileElementType TYPE_CODE_FRAGMENT = new JetTypeCodeFragmentType();
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java
+1
View File
@@ -129,6 +129,7 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
@Override
public void setPackageName(String packageName) { }
// SCRIPT: find script in file
@Nullable
public JetScript getScript() {
return PsiTreeUtil.getChildOfType(this, JetScript.class);
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+2
View File
@@ -378,10 +378,12 @@ public class JetPsiUtil {
return callOperationNode != null && callOperationNode.getElementType() == JetTokens.SAFE_ACCESS;
}
// SCRIPT: is declaration in script?
public static boolean isScriptDeclaration(@NotNull JetDeclaration namedDeclaration) {
return getScript(namedDeclaration) != null;
}
// SCRIPT: get script from top-level declaration
@Nullable
public static JetScript getScript(@NotNull JetDeclaration namedDeclaration) {
PsiElement parent = namedDeclaration.getParent();
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java
+1
View File
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
// SCRIPT: Script declaration
public class JetScript extends JetDeclarationImpl {
public JetScript(@NotNull ASTNode node) {
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetFileStubImpl.java
+1
View File
@@ -40,6 +40,7 @@ public class PsiJetFileStubImpl extends PsiFileStubImpl<JetFile> implements PsiJ
public PsiJetFileStubImpl(JetFile jetFile, @NotNull StringRef packageName, boolean isScript) {
super(jetFile);
this.packageName = packageName;
// SCRIPT: PsiJetFileStubImpl knows about scripting
this.isScript = isScript;
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+1
View File
@@ -128,6 +128,7 @@ public class BodyResolver {
resolveFunctionBodies(c);
// SCRIPT: resolve script bodies
scriptBodyResolverResolver.resolveScriptBodies(c);
if (!c.getTopDownAnalysisParameters().isDeclaredLocally()) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+2
View File
@@ -79,6 +79,7 @@ public class DeclarationResolver {
this.trace = trace;
}
// SCRIPT: inject script header resolver
@Inject
public void setScriptHeaderResolver(@NotNull ScriptHeaderResolver scriptHeaderResolver) {
this.scriptHeaderResolver = scriptHeaderResolver;
@@ -149,6 +150,7 @@ public class DeclarationResolver {
classDescriptor.getBuilder());
}
// SCRIPT: Resolve script declarations, move outside of this function
scriptHeaderResolver.resolveScriptDeclarations(c);
// TODO : Extensions
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java
+1
View File
@@ -78,6 +78,7 @@ public class ImportsResolver {
WritableScope fileScope = c.getFileScopes().get(file);
processImportsInFile(lookupMode, fileScope, Lists.newArrayList(file.getImportDirectives()), file.getPackageFqName().isRoot());
}
// SCRIPT: process script import directives
for (JetScript script : c.getScripts().keySet()) {
WritableScope scriptScope = c.getScriptScopes().get(script);
processImportsInFile(lookupMode, scriptScope, script.getImportDirectives(), true);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java
+2
View File
@@ -40,6 +40,8 @@ import java.util.Map;
import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE;
// SCRIPT: resolve symbols in scripts
public class ScriptBodyResolver {
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java
+1
View File
@@ -46,6 +46,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
// SCRIPT: Resolve declarations in scripts
public class ScriptHeaderResolver {
public static final Key<Integer> PRIORITY_KEY = Key.create(JetScript.class.getName() + ".priority");
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java
+2
View File
@@ -327,6 +327,8 @@ public class TopDownAnalyzer {
for (ClassDescriptorWithResolutionScopes mutableClassDescriptor : c.getClasses().values()) {
((MutableClassDescriptor) mutableClassDescriptor).lockScopes();
}
// SCRIPT: extra code for scripts
Set<FqName> scriptFqNames = Sets.newHashSet();
for (JetFile file : c.getFileScopes().keySet()) {
if (file.isScript()) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+2
View File
@@ -70,6 +70,7 @@ public class TypeHierarchyResolver {
this.descriptorResolver = descriptorResolver;
}
// SCRIPT: inject script header resolver
@Inject
public void setScriptHeaderResolver(@NotNull ScriptHeaderResolver scriptHeaderResolver) {
this.scriptHeaderResolver = scriptHeaderResolver;
@@ -347,6 +348,7 @@ public class TypeHierarchyResolver {
c.getFileScopes().put(file, packageScope);
if (file.isScript()) {
// SCRIPT: process script hierarchy
scriptHeaderResolver.processScriptHierarchy(c, file.getScript(), packageScope);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DataFlowValueFactory.java
+1
View File
@@ -60,6 +60,7 @@ public class DataFlowValueFactory {
@NotNull
public static DataFlowValue createDataFlowValue(@NotNull ReceiverValue receiverValue, @NotNull BindingContext bindingContext) {
if (receiverValue instanceof TransientReceiver || receiverValue instanceof ScriptReceiver) {
// SCRIPT: autocasts data flow
JetType type = receiverValue.getType();
boolean nullable = type.isNullable() || TypeUtils.hasNullableSuperType(type);
return new DataFlowValue(receiverValue, type, nullable, Nullability.NOT_NULL);
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
+1
View File
@@ -209,6 +209,7 @@ public class ExpressionTypingServices {
) {
List<JetElement> block = expression.getStatements();
// SCRIPT: get code descriptor for script declaration
DeclarationDescriptor containingDescriptor = context.scope.getContainingDeclaration();
if (containingDescriptor instanceof ScriptDescriptor) {
if (!(expression.getParent() instanceof JetScript)) {
compiler/tests/org/jetbrains/jet/codegen/CodegenTestFiles.java
+1
View File
@@ -116,6 +116,7 @@ public class CodegenTestFiles {
List<AnalyzerScriptParameter> scriptParameterTypes = Lists.newArrayList();
List<Object> scriptParameterValues = Lists.newArrayList();
// SCRIPT: extract script params, move to ScriptingUtil
if (file.isScript()) {
Pattern scriptParametersPattern = Pattern.compile("param: (\\S+): (\\S+): (\\S.*)");
Matcher scriptParametersMatcher = scriptParametersPattern.matcher(file.getText());
core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java
+1
View File
@@ -35,6 +35,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
// SCRIPT: Script declaration descriptor
public class ScriptDescriptor extends DeclarationDescriptorNonRootImpl {
public static final String LAST_EXPRESSION_VALUE_FIELD_NAME = "rv";
private static final Name NAME = Name.special("<script>");
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java
+1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.jet.lang.descriptors.ScriptDescriptor;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
// SCRIPT: script receiver
public class ScriptReceiver implements ThisReceiver {
@NotNull
idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
private static void forceResolvePackageDeclarations(@NotNull Collection<JetFile> files, @NotNull KotlinCodeAnalyzer session) {
for (JetFile file : files) {
// Scripts are not supported
// SCRIPT: not supported
if (file.isScript()) continue;
FqName packageFqName = file.getPackageFqName();