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

Just rename some variables like: *factory -> outputFiles

Browse Source
This commit is contained in:
Zalim Bashorov
2013-11-08 12:26:39 +04:00
parent 4cea0a3de4
commit 637c6635bd
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+7 -7
View File
@@ -32,8 +32,8 @@ import org.jetbrains.jet.cli.common.CompilerPlugin;
import org.jetbrains.jet.cli.common.CompilerPluginContext;
import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.OutputDirector;
import org.jetbrains.jet.SingleDirectoryDirector;
import org.jetbrains.jet.cli.common.output.OutputDirector;
import org.jetbrains.jet.cli.common.output.SingleDirectoryDirector;
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
import org.jetbrains.jet.codegen.*;
import org.jetbrains.jet.codegen.state.GenerationState;
@@ -113,14 +113,14 @@ public class KotlinToJVMBytecodeCompiler {
private static void writeOutput(
CompilerConfiguration configuration,
ClassFileFactory moduleFactory,
ClassFileFactory outputFiles,
OutputDirector outputDir,
File jarPath,
boolean jarRuntime,
FqName mainClass
) {
MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE);
CompileEnvironmentUtil.writeOutputToDirOrJar(jarPath, outputDir, jarRuntime, mainClass, moduleFactory, messageCollector);
CompileEnvironmentUtil.writeOutputToDirOrJar(jarPath, outputDir, jarRuntime, mainClass, outputFiles, messageCollector);
}
public static boolean compileModules(
@@ -135,8 +135,8 @@ public class KotlinToJVMBytecodeCompiler {
modules = Collections.<Module>singletonList(new ChunkAsOneModule(chunk));
}
for (Module module : modules) {
ClassFileFactory moduleFactory = compileModule(configuration, module, directory);
if (moduleFactory == null) {
ClassFileFactory outputFiles = compileModule(configuration, module, directory);
if (outputFiles == null) {
return false;
}
OutputDirector outputDir = new OutputDirector() {
@@ -154,7 +154,7 @@ public class KotlinToJVMBytecodeCompiler {
}
};
writeOutput(configuration, moduleFactory, outputDir, jarPath, jarRuntime, null);
writeOutput(configuration, outputFiles, outputDir, jarPath, jarRuntime, null);
}
return true;
}