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

Reorder method parameters

Browse Source
This commit is contained in:
Andrey Breslav
2013-04-22 15:35:51 +04:00
parent 2ce6d16433
commit ddb474ea8e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/CompilerRunnerUtil.java
+5 -4
View File
@@ -88,11 +88,12 @@ public class CompilerRunnerUtil {
} }
} }
public static Object invokeExecMethod(CompilerEnvironment environment, public static Object invokeExecMethod(
PrintStream out, String className, String[] arguments, CompilerEnvironment environment,
MessageCollector messageCollector, String[] arguments, String name) throws Exception { MessageCollector messageCollector, PrintStream out
) throws Exception {
URLClassLoader loader = getOrCreateClassLoader(environment.getKotlinPaths(), messageCollector); URLClassLoader loader = getOrCreateClassLoader(environment.getKotlinPaths(), messageCollector);
Class<?> kompiler = Class.forName(name, true, loader); Class<?> kompiler = Class.forName(className, true, loader);
Method exec = kompiler.getMethod("exec", PrintStream.class, String[].class); Method exec = kompiler.getMethod("exec", PrintStream.class, String[].class);
return exec.invoke(kompiler.newInstance(), out, arguments); return exec.invoke(kompiler.newInstance(), out, arguments);
} }
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class KotlinCompilerRunner {
messageCollector.report(CompilerMessageSeverity.INFO, messageCollector.report(CompilerMessageSeverity.INFO,
"Invoking in-process compiler " + compilerClassName + " with arguments " + Arrays.asList(arguments), "Invoking in-process compiler " + compilerClassName + " with arguments " + Arrays.asList(arguments),
CompilerMessageLocation.NO_LOCATION); CompilerMessageLocation.NO_LOCATION);
Object rc = CompilerRunnerUtil.invokeExecMethod(environment, out, messageCollector, arguments, compilerClassName); Object rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, arguments, environment, messageCollector, out);
// exec() returns a K2JVMCompiler.ExitCode object, that class is not accessible here, // exec() returns a K2JVMCompiler.ExitCode object, that class is not accessible here,
// so we take it's contents through reflection // so we take it's contents through reflection
return CompilerRunnerUtil.getReturnCodeFromObject(rc); return CompilerRunnerUtil.getReturnCodeFromObject(rc);
idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
+1 -1
View File
@@ -129,7 +129,7 @@ public final class K2JSCompiler implements TranslatingCompiler {
File outDir = environment.getOutput(); File outDir = environment.getOutput();
File outFile = new File(outDir, module.getName() + ".js"); File outFile = new File(outDir, module.getName() + ".js");
String[] commandLineArgs = constructArguments(module, outFile); String[] commandLineArgs = constructArguments(module, outFile);
Object rc = invokeExecMethod(environment, out, messageCollector, commandLineArgs, "org.jetbrains.jet.cli.js.K2JSCompiler"); Object rc = invokeExecMethod("org.jetbrains.jet.cli.js.K2JSCompiler", commandLineArgs, environment, messageCollector, out);
if (!ApplicationManager.getApplication().isUnitTestMode()) { if (!ApplicationManager.getApplication().isUnitTestMode()) {
VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByIoFile(outDir); VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByIoFile(outDir);