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

Split OutputFileFactory to OutputFileCollection and OutputFile

Browse Source
This commit is contained in:
Zalim Bashorov
2013-11-08 12:21:07 +04:00
parent e041e950c8
commit ae8ac28ddc
5 changed files with 97 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend-common/src/output/OutputFileFactory.kt → compiler/backend-common/src/output.kt
+9 -5
View File
@@ -18,10 +18,14 @@ package org.jetbrains.jet
import java.io.File
public trait OutputFileFactory {
public val outputFiles: List<String>
public trait OutputFileCollection {
public fun get(relativePath: String): OutputFile?
public fun asList(): List<OutputFile>
}
public fun getSourceFiles(file: String): List<File>
public fun asBytes(file: String): ByteArray
public fun asText(file: String): String
public trait OutputFile {
public val relativePath: String
public val sourceFiles: List<File>
public fun asByteArray(): ByteArray
public fun asText(): String
}
compiler/backend-common/src/output/outputUtils.kt
-38
View File
@@ -1,38 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.outputUtils
import java.io.File
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.jet.OutputFileFactory
import org.jetbrains.jet.SingleDirectoryDirector
import org.jetbrains.jet.OutputDirector
public fun OutputFileFactory.writeAll(outputDirector: OutputDirector, report: (sources: List<File>, output: File) -> Unit) {
for (file in outputFiles) {
val sources = getSourceFiles(file)
val output = File(outputDirector.getOutputDirectory(sources), file)
report(sources, output)
FileUtil.writeToFile(output, this.asBytes(file))
}
}
private val REPORT_NOTHING = { (sources: List<File>, output: File) -> }
public inline fun OutputFileFactory.writeAllTo(outputDir: File) {
writeAll(SingleDirectoryDirector(outputDir), REPORT_NOTHING)
}
compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
+65 -42
View File
@@ -23,8 +23,10 @@ import com.intellij.psi.PsiFile;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.asm4.Type;
import org.jetbrains.jet.OutputFileFactory;
import org.jetbrains.jet.OutputFile;
import org.jetbrains.jet.OutputFileCollection;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.codegen.state.GenerationStateAware;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -39,7 +41,7 @@ import static org.jetbrains.jet.codegen.AsmUtil.asmTypeByFqNameWithoutInnerClass
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName;
public final class ClassFileFactory extends GenerationStateAware implements OutputFileFactory {
public final class ClassFileFactory extends GenerationStateAware implements OutputFileCollection {
@NotNull private ClassBuilderFactory builderFactory;
private final Map<FqName, NamespaceCodegen> ns2codegen = new HashMap<FqName, NamespaceCodegen>();
@@ -50,7 +52,6 @@ public final class ClassFileFactory extends GenerationStateAware implements Outp
super(state);
}
@Inject
public void setBuilderFactory(@NotNull ClassBuilderFactory builderFactory) {
this.builderFactory = builderFactory;
@@ -80,53 +81,30 @@ public final class ClassFileFactory extends GenerationStateAware implements Outp
}
@Override
public String asText(String file) {
public List<OutputFile> asList() {
done();
return builderFactory.asText(generators.get(file).classBuilder);
return ContainerUtil.map(generators.keySet(), new Function<String, OutputFile>() {
@Override
public OutputFile fun(String relativeClassFilePath) {
return new OutputClassFile(relativeClassFilePath);
}
});
}
@Override
public byte[] asBytes(String file) {
done();
return builderFactory.asBytes(generators.get(file).classBuilder);
}
@Nullable
public OutputFile get(@NotNull String relativePath) {
if (generators.containsKey(relativePath)) return new OutputClassFile(relativePath);
@Override
public List<String> getOutputFiles() {
done();
return new ArrayList<String>(generators.keySet());
}
@Override
public List<File> getSourceFiles(String relativeClassFilePath) {
ClassBuilderAndSourceFileList pair = generators.get(relativeClassFilePath);
if (pair == null) {
throw new IllegalStateException("No record for binary file " + relativeClassFilePath);
}
return ContainerUtil.mapNotNull(
pair.sourceFiles,
new Function<PsiFile, File>() {
@Override
public File fun(PsiFile file) {
VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile == null) return null;
return VfsUtilCore.virtualToIoFile(virtualFile);
}
}
);
return null;
}
public String createText() {
StringBuilder answer = new StringBuilder();
List<String> files = getOutputFiles();
for (String file : files) {
// if (!file.startsWith("kotlin/")) {
answer.append("@").append(file).append('\n');
answer.append(asText(file));
// }
for (OutputFile file : asList()) {
answer.append("@").append(file.getRelativePath()).append('\n');
answer.append(file.asText());
}
return answer.toString();
@@ -181,7 +159,53 @@ public final class ClassFileFactory extends GenerationStateAware implements Outp
return result;
}
private static class ClassBuilderAndSourceFileList {
private final class OutputClassFile implements OutputFile {
final String relativeClassFilePath;
OutputClassFile(String relativeClassFilePath) {
this.relativeClassFilePath = relativeClassFilePath;
}
@Override
public String getRelativePath() {
return relativeClassFilePath;
}
@Override
public List<File> getSourceFiles() {
ClassBuilderAndSourceFileList pair = generators.get(relativeClassFilePath);
if (pair == null) {
throw new IllegalStateException("No record for binary file " + relativeClassFilePath);
}
return ContainerUtil.mapNotNull(
pair.sourceFiles,
new Function<PsiFile, File>() {
@Override
public File fun(PsiFile file) {
VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile == null) return null;
return VfsUtilCore.virtualToIoFile(virtualFile);
}
}
);
}
@Override
public byte[] asByteArray() {
done();
return builderFactory.asBytes(generators.get(relativeClassFilePath).classBuilder);
}
@Override
public String asText() {
done();
return builderFactory.asText(generators.get(relativeClassFilePath).classBuilder);
}
}
private static final class ClassBuilderAndSourceFileList {
private final ClassBuilder classBuilder;
private final Collection<? extends PsiFile> sourceFiles;
@@ -190,5 +214,4 @@ public final class ClassFileFactory extends GenerationStateAware implements Outp
this.sourceFiles = sourceFiles;
}
}
}
compiler/backend-common/src/output/outputDirectors.kt → compiler/cli/src/org/jetbrains/jet/cli/common/output/outputDirectors.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet
package org.jetbrains.jet.cli.common.output
import java.io.File
compiler/cli/src/org/jetbrains/jet/cli/common/outputUtils.kt → compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt
+22 -5
View File
@@ -14,17 +14,34 @@
* limitations under the License.
*/
package org.jetbrains.jet.cli.common.outputUtils
package org.jetbrains.jet.cli.common.output.outputUtils
import org.jetbrains.jet.OutputFileFactory
import org.jetbrains.jet.OutputDirector
import org.jetbrains.jet.outputUtils.writeAll
import org.jetbrains.jet.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
import org.jetbrains.jet.cli.common.messages.MessageCollector
import org.jetbrains.jet.cli.common.output.OutputDirector
import java.io.File
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.jet.cli.common.output.SingleDirectoryDirector
public inline fun OutputFileFactory.writeAll(outputDirector: OutputDirector, messageCollector: MessageCollector) {
public fun OutputFileCollection.writeAll(outputDirector: OutputDirector, report: (sources: List<File>, output: File) -> Unit) {
for (file in asList()) {
val sources = file.sourceFiles
val output = File(outputDirector.getOutputDirectory(sources), file.relativePath)
report(sources, output)
FileUtil.writeToFile(output, file.asByteArray())
}
}
private val REPORT_NOTHING = { (sources: List<File>, output: File) -> }
public inline fun OutputFileCollection.writeAllTo(outputDir: File) {
writeAll(SingleDirectoryDirector(outputDir), REPORT_NOTHING)
}
public inline fun OutputFileCollection.writeAll(outputDirector: OutputDirector, messageCollector: MessageCollector) {
writeAll(outputDirector) { sources, output ->
messageCollector.report(CompilerMessageSeverity.OUTPUT, OutputMessageUtil.formatOutputMessage(sources, output), CompilerMessageLocation.NO_LOCATION)
}