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

Move *OutputFile to package org.jetbrains.kotlin.backend.common.output

Browse Source
This commit is contained in:
Alexander Udalov
2015-01-06 05:09:36 +03:00
parent 329d9da8c8
commit 759b5bd85c
28 changed files with 77 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.cli.common.output.outputUtils
import org.jetbrains.jet.OutputFileCollection
import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation
import org.jetbrains.jet.cli.common.messages.OutputMessageUtil
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity
@@ -43,4 +43,4 @@ public fun OutputFileCollection.writeAll(outputDir: File, messageCollector: Mess
writeAll(outputDir) { sources, output ->
messageCollector.report(CompilerMessageSeverity.OUTPUT, OutputMessageUtil.formatOutputMessage(sources, output), CompilerMessageLocation.NO_LOCATION)
}
}
}
compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+1 -1
View File
@@ -32,7 +32,6 @@ import kotlin.Function1;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.OutputFileCollection;
import org.jetbrains.jet.analyzer.AnalysisResult;
import org.jetbrains.jet.cli.common.CLICompiler;
import org.jetbrains.jet.cli.common.CLIConfigurationKeys;
@@ -52,6 +51,7 @@ import org.jetbrains.jet.config.Services;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
import org.jetbrains.kotlin.js.config.Config;
import org.jetbrains.kotlin.js.config.EcmaVersion;
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+2 -2
View File
@@ -36,7 +36,6 @@ import kotlin.modules.AllModules;
import kotlin.modules.Module;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.OutputFile;
import org.jetbrains.jet.cli.common.CLIConfigurationKeys;
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
@@ -57,6 +56,7 @@ import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.utils.KotlinPaths;
import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.jet.utils.UtilsPackage;
import org.jetbrains.kotlin.backend.common.output.OutputFile;
import java.io.*;
import java.lang.reflect.Method;
@@ -162,7 +162,7 @@ public class CompileEnvironmentUtil {
method.setAccessible(true);
method.invoke(null);
ArrayList<Module> answer = new ArrayList<Module>(AllModules.INSTANCE$.get());
List<Module> answer = new ArrayList<Module>(AllModules.INSTANCE$.get());
AllModules.INSTANCE$.get().clear();
return answer;
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+1 -1
View File
@@ -32,7 +32,6 @@ import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.OutputFile;
import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.cli.common.messages.MessageCollectorToString;
@@ -65,6 +64,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetLanguage;
import org.jetbrains.jet.utils.UtilsPackage;
import org.jetbrains.kotlin.backend.common.output.OutputFile;
import org.jetbrains.kotlin.di.InjectorForReplWithJava;
import org.jetbrains.org.objectweb.asm.Type;