From 637c6635bd3f7633d9298d210bb4c160f6b5d7b9 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 8 Nov 2013 12:26:39 +0400 Subject: [PATCH] Just rename some variables like: *factory -> outputFiles --- .../CodegenTestsOnAndroidGenerator.java | 20 +++++++++---------- .../compiler/KotlinToJVMBytecodeCompiler.java | 14 ++++++------- ...bstractCompileKotlinAgainstKotlinTest.java | 8 ++++---- .../compiler/AbstractWriteSignatureTest.java | 8 ++++---- .../jet/jvm/compiler/LoadDescriptorUtil.java | 8 ++++---- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java index 4e60b7ab31d..cb44c3d98db 100644 --- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java @@ -23,9 +23,9 @@ import com.intellij.testFramework.UsefulTestCase; import junit.framework.Assert; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.outputUtils.OutputUtilsPackage; +import org.jetbrains.jet.OutputFileCollection; +import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.compiler.PathManager; import org.jetbrains.jet.generators.tests.generator.TestGeneratorUtil; @@ -132,12 +132,12 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { String generatedTestName = generateTestName(file.getName()); String packageName = file.getPath().replaceAll("\\\\|-|\\.|/", "_"); text = changePackage(packageName, text); - ClassFileFactory factory; + OutputFileCollection outputFiles; if (filesCompiledWithoutStdLib.contains(file.getName())) { - factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithMockJdk); + outputFiles = compileFromText(file.getAbsolutePath(), text, environmentWithMockJdk); } else { - factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithFullJdk); + outputFiles = compileFromText(file.getAbsolutePath(), text, environmentWithFullJdk); } generateTestMethod(p, generatedTestName, StringUtil.escapeStringCharacters(file.getPath())); @@ -147,22 +147,22 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { } Assert.assertTrue("Cannot create directory for compiled files", outputDir.exists()); - OutputUtilsPackage.writeAllTo(factory, outputDir); + OutputUtilsPackage.writeAllTo(outputFiles, outputDir); } } } } - private static ClassFileFactory getFactoryFromText(String filePath, String text, JetCoreEnvironment jetEnvironment) { + private static OutputFileCollection compileFromText(String filePath, String text, JetCoreEnvironment jetEnvironment) { JetFile psiFile = JetTestUtils.createFile("dummy.kt", text, jetEnvironment.getProject()); - ClassFileFactory factory; + OutputFileCollection outputFiles; try { - factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); + outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); } catch (Throwable e) { throw new RuntimeException("Cannot compile: " + filePath + "\n" + text, e); } - return factory; + return outputFiles; } private static boolean hasBoxMethod(String text) { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 1e06ff18a5d..d81a9d867d6 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -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.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; } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index 1b2b64cad46..79f00ec7f06 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -23,10 +23,10 @@ import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.OutputFileCollection; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.outputUtils.OutputUtilsPackage; +import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.psi.JetFile; @@ -91,9 +91,9 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit JetFile psiFile = JetTestUtils.createFile(file.getName(), text, jetCoreEnvironment.getProject()); - ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); + OutputFileCollection outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); - OutputUtilsPackage.writeAllTo(classFileFactory, outputDir); + OutputUtilsPackage.writeAllTo(outputFiles, outputDir); Disposer.dispose(disposable); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java index 52bf3f95c2a..d6c9e33f17b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java @@ -27,9 +27,9 @@ import org.jetbrains.asm4.ClassVisitor; import org.jetbrains.asm4.MethodVisitor; import org.jetbrains.asm4.Opcodes; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.outputUtils.OutputUtilsPackage; +import org.jetbrains.jet.OutputFileCollection; +import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.test.TestCaseWithTmpdir; @@ -70,9 +70,9 @@ public abstract class AbstractWriteSignatureTest extends TestCaseWithTmpdir { JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject()); - ClassFileFactory classFileFactory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); + OutputFileCollection outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); - OutputUtilsPackage.writeAllTo(classFileFactory, tmpdir); + OutputUtilsPackage.writeAllTo(outputFiles, tmpdir); Disposer.dispose(myTestRootDisposable); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 766deed08cc..85ee9dd864b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -22,10 +22,11 @@ import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.OutputFileCollection; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.analyzer.AnalyzeExhaust; +import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; @@ -38,7 +39,6 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.outputUtils.OutputUtilsPackage; import java.io.File; import java.io.IOException; @@ -79,8 +79,8 @@ public final class LoadDescriptorUtil { JetFileAndExhaust fileAndExhaust = JetFileAndExhaust.createJetFileAndAnalyze(kotlinFile, disposable, configurationKind); GenerationState state = GenerationUtils.compileFilesGetGenerationState(fileAndExhaust.getJetFile().getProject(), fileAndExhaust.getExhaust(), Collections.singletonList( fileAndExhaust.getJetFile())); - ClassFileFactory classFileFactory = state.getFactory(); - OutputUtilsPackage.writeAllTo(classFileFactory, outDir); + OutputFileCollection outputFiles = state.getFactory(); + OutputUtilsPackage.writeAllTo(outputFiles, outDir); return fileAndExhaust.getExhaust(); }