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

better script class name

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-08 04:19:23 +04:00
parent 2d88c74635
commit 8a3d3d21bd
9 changed files with 97 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+1 -1
View File
@@ -160,7 +160,7 @@ public class KotlinToJVMBytecodeCompiler {
configuration.getEnvironment().getCompilerDependencies().getRuntimeJar().toURI().toURL()
},
AllModules.class.getClassLoader()));
Class<?> scriptClass = classLoader.loadClass("Script");
Class<?> scriptClass = classLoader.loadClass(ScriptCodegen.SCRIPT_DEFAULT_CLASS_NAME.getFqName().getFqName());
scriptClass.getConstructor(String[].class).newInstance(new Object[]{ configuration.getScriptArgs().toArray(new String[0]) });
} catch (Exception e) {
throw new RuntimeException("Failed to evaluate script: " + e, e);
compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+2 -1
View File
@@ -35,6 +35,7 @@ import org.jetbrains.jet.codegen.ClassBuilderFactories;
import org.jetbrains.jet.codegen.CompilationErrorHandler;
import org.jetbrains.jet.codegen.GeneratedClassLoader;
import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.codegen.ScriptCodegen;
import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -109,7 +110,7 @@ public class ReplInterpreter {
generationState.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION);
try {
Class<?> scriptClass = new GeneratedClassLoader(generationState.getFactory()).loadClass("Script");
Class<?> scriptClass = new GeneratedClassLoader(generationState.getFactory()).loadClass(ScriptCodegen.SCRIPT_DEFAULT_CLASS_NAME.getFqName().getFqName());
Constructor<?> scriptInstanceConstructor = scriptClass.getConstructor(new Class<?>[0]);
Object scriptInstance = scriptInstanceConstructor.newInstance(new Object[0]);
Field rvField = scriptClass.getDeclaredField("rv");