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

Minor. ScriptNameUtil works on scripts, not files

Browse Source
This commit is contained in:
Andrey Breslav
2014-03-28 21:23:37 +04:00
parent caa80a0552
commit d909a03453
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java
+2 -1
View File
@@ -38,9 +38,10 @@ 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
FqName name = ScriptNameUtil.classNameForScript(file);
JetScript script = file.getScript();
assert script != null;
FqName name = ScriptNameUtil.classNameForScript(script);
Type type = AsmUtil.asmTypeByFqNameWithoutInnerClasses(name);
registerClassNameForScript(state.getBindingTrace(), script, type);
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+1 -1
View File
@@ -235,7 +235,7 @@ public class KotlinToJVMBytecodeCompiler {
}, AllModules.class.getClassLoader())
);
FqName nameForScript = ScriptNameUtil.classNameForScript(environment.getSourceFiles().get(0));
FqName nameForScript = ScriptNameUtil.classNameForScript(environment.getSourceFiles().get(0).getScript());
return classLoader.loadClass(nameForScript.asString());
}
catch (Exception e) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class ScriptHeaderResolver {
Integer priority = getScriptPriority(script);
FqName nameForScript = ScriptNameUtil.classNameForScript((JetFile) script.getContainingFile());
FqName nameForScript = ScriptNameUtil.classNameForScript(script);
Name className = nameForScript.shortName();
ScriptDescriptorImpl scriptDescriptor = new ScriptDescriptorImpl(ns, priority, outerScope, className);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java
+3 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPackageDirective;
import org.jetbrains.jet.lang.psi.JetScript;
import org.jetbrains.jet.lang.resolve.name.FqName;
public class ScriptNameUtil {
@@ -28,7 +29,8 @@ public class ScriptNameUtil {
}
@NotNull
public static FqName classNameForScript(JetFile file) {
public static FqName classNameForScript(JetScript script) {
JetFile file = (JetFile) script.getContainingFile();
JetScriptDefinition scriptDefinition = JetScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file);
String name = file.getName();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt
+1 -1
View File
@@ -78,7 +78,7 @@ public class LazyScriptDescriptor(
override fun getPriority() = _priority
private val _classDescriptor = resolveSession.getStorageManager().createLazyValue {
val nameForScript = ScriptNameUtil.classNameForScript(jetScript.getContainingFile() as JetFile)
val nameForScript = ScriptNameUtil.classNameForScript(jetScript)
val className = nameForScript.shortName()
LazyClassDescriptor(
resolveSession,
compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ScriptGenTest extends CodegenTestCase {
loadFile(filename);
try {
FqName fqName = ScriptNameUtil.classNameForScript(myFiles.getPsiFile());
FqName fqName = ScriptNameUtil.classNameForScript(myFiles.getPsiFile().getScript());
Class<?> scriptClass = generateClass(fqName.asString());
Constructor constructor = getConstructor(scriptClass);