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

JS backend: report backend diagnostics

Browse Source
This commit is contained in:
Alexey Tsvetkov
2014-12-04 13:52:23 +03:00
parent 348a452e01
commit 46326fe5ac
7 changed files with 102 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+15 -24
View File
@@ -50,11 +50,12 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.config.Services;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
import org.jetbrains.k2js.config.*;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.facade.Status;
import java.io.File;
import java.util.List;
@@ -149,15 +150,22 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
}
MainCallParameters mainCallParameters = createMainCallParameters(arguments.main);
BindingTraceContext trace = new BindingTraceContext();
config.setTrace(trace);
OutputFileCollection outputFiles = translate(mainCallParameters, config, sourcesFiles, outputFile, outputPrefixFile, outputPostfixFile);
Status<OutputFileCollection> status;
Diagnostics diagnostics = trace.getBindingContext().getDiagnostics();
if (AnalyzerWithCompilerReport.reportDiagnostics(diagnostics, messageCollector)) {
return ExitCode.COMPILATION_ERROR;
try {
//noinspection unchecked
status = translateWithMainCallParameters(mainCallParameters, sourcesFiles, outputFile, outputPrefixFile, outputPostfixFile,
config, Consumer.EMPTY_CONSUMER);
} catch (Exception e) {
throw new RuntimeException(e);
}
Diagnostics diagnostics = config.getTrace().getBindingContext().getDiagnostics();
AnalyzerWithCompilerReport.reportDiagnostics(diagnostics, messageCollector);
if (status.isFail()) return ExitCode.COMPILATION_ERROR;
OutputFileCollection outputFiles = status.getResult();
if (outputFile.isDirectory()) {
messageCollector.report(CompilerMessageSeverity.ERROR,
"Cannot open output file '" + outputFile.getPath() + "': is a directory",
@@ -190,23 +198,6 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
CompilerMessageLocation.NO_LOCATION);
}
private static OutputFileCollection translate(
@NotNull MainCallParameters mainCall,
@NotNull Config config,
@NotNull List<JetFile> sourceFiles,
@NotNull File outputFile,
@Nullable File outputPrefix,
@Nullable File outputPostfix
) {
try {
//noinspection unchecked
return translateWithMainCallParameters(mainCall, sourceFiles, outputFile, outputPrefix, outputPostfix, config, Consumer.EMPTY_CONSUMER);
}
catch (Exception e) {
throw new RuntimeException(e);
}
}
private static boolean analyzeAndReportErrors(@NotNull MessageCollector messageCollector,
@NotNull final List<JetFile> sources, @NotNull final Config config) {
AnalyzerWithCompilerReport analyzerWithCompilerReport = new AnalyzerWithCompilerReport(messageCollector);
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java
+9
View File
@@ -29,6 +29,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import java.util.Collection;
import java.util.Collections;
@@ -210,4 +211,12 @@ public class DiagnosticUtils {
return "(" + line + "," + column + ")";
}
}
public static boolean hasError(Diagnostics diagnostics) {
for (Diagnostic diagnostic : diagnostics.all()) {
if (diagnostic.getSeverity() == Severity.ERROR) return true;
}
return false;
}
}
js/js.frontend/src/org/jetbrains/k2js/config/Config.java
+2 -9
View File
@@ -23,13 +23,10 @@ import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.DiagnosticSink;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace;
import java.util.Collection;
import java.util.List;
@@ -53,7 +50,7 @@ public abstract class Config {
private final boolean sourcemap;
@NotNull
private DiagnosticSink trace = new BindingTraceContext();
private final BindingTrace trace = new BindingTraceContext();
public Config(
@NotNull Project project,
@@ -111,14 +108,10 @@ public abstract class Config {
}
@NotNull
public DiagnosticSink getTrace() {
public BindingTrace getTrace() {
return trace;
}
public void setTrace(@NotNull DiagnosticSink trace) {
this.trace = trace;
}
@Nullable
public ModuleDescriptor getLibraryModule() {
return null;
js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+7 -6
View File
@@ -43,6 +43,7 @@ import org.jetbrains.k2js.JavaScript;
import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.config.LibrarySourcesConfigWithCaching;
import org.jetbrains.k2js.facade.Status;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
import org.jetbrains.k2js.test.utils.JsTestUtils;
@@ -161,15 +162,15 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
@NotNull MainCallParameters mainCallParameters,
@NotNull Config config
) throws Exception {
//noinspection unchecked
OutputFileCollection outputFiles =
translateWithMainCallParameters(mainCallParameters, jetFiles, outputFile,
getOutputPrefixFile(), getOutputPostfixFile(),
config, getConsumer());
Status<OutputFileCollection> status = translateWithMainCallParameters(mainCallParameters, jetFiles, outputFile,
getOutputPrefixFile(), getOutputPostfixFile(),
config, getConsumer());
if (status.isFail()) return;
File outputDir = outputFile.getParentFile();
assert outputDir != null : "Parent file for output file should not be null, outputFilePath: " + outputFile.getPath();
OutputUtilsPackage.writeAllTo(outputFiles, outputDir);
OutputUtilsPackage.writeAllTo(status.getResult(), outputDir);
}
protected File getOutputPostfixFile() {
js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+25 -12
View File
@@ -38,6 +38,7 @@ import org.jetbrains.jet.analyzer.AnalysisResult;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder;
@@ -45,6 +46,7 @@ import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.facade.exceptions.TranslationException;
import org.jetbrains.k2js.inline.JsInliner;
import org.jetbrains.k2js.translate.general.Translation;
import java.io.File;
@@ -52,6 +54,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.hasError;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.k2js.facade.FacadeUtils.parseString;
@@ -63,7 +66,7 @@ public final class K2JSTranslator {
public static final String FLUSH_SYSTEM_OUT = "Kotlin.out.flush();\n";
public static final String GET_SYSTEM_OUT = "Kotlin.out.buffer;\n";
public static OutputFileCollection translateWithMainCallParameters(
public static Status<OutputFileCollection> translateWithMainCallParameters(
@NotNull MainCallParameters mainCall,
@NotNull List<JetFile> files,
@NotNull File outputFile,
@@ -75,8 +78,11 @@ public final class K2JSTranslator {
K2JSTranslator translator = new K2JSTranslator(config);
TextOutputImpl output = new TextOutputImpl();
SourceMapBuilder sourceMapBuilder = config.isSourcemap() ? new SourceMap3Builder(outputFile, output, new SourceMapBuilderConsumer()) : null;
String programCode = translator.generateProgramCode(files, mainCall, output, sourceMapBuilder, astConsumer);
Status<String> codeStatus = translator.generateProgramCode(files, mainCall, output, sourceMapBuilder, astConsumer);
if (codeStatus.isFail()) return Status.fail();
String programCode = codeStatus.getResult();
String prefix = FileUtilsPackage.readTextOrEmpty(outputPrefixFile);
String postfix = FileUtilsPackage.readTextOrEmpty(outputPostfixFile);
@@ -101,7 +107,8 @@ public final class K2JSTranslator {
outputFiles.add(sourcemapFile);
}
return new SimpleOutputFileCollection(outputFiles);
OutputFileCollection outputFileCollection = new SimpleOutputFileCollection(outputFiles);
return Status.success(outputFileCollection);
}
@NotNull
@@ -114,26 +121,30 @@ public final class K2JSTranslator {
//NOTE: web demo related method
@SuppressWarnings("UnusedDeclaration")
@NotNull
public String translateStringWithCallToMain(@NotNull String programText, @NotNull String argumentsString) throws TranslationException {
public Status<String> translateStringWithCallToMain(@NotNull String programText, @NotNull String argumentsString) throws TranslationException {
JetFile file = JetPsiFactory(getProject()).createFile("test", programText);
String programCode = generateProgramCode(file, MainCallParameters.mainWithArguments(parseString(argumentsString))) + "\n";
return FLUSH_SYSTEM_OUT + programCode + GET_SYSTEM_OUT;
Status<String> status = generateProgramCode(file, MainCallParameters.mainWithArguments(parseString(argumentsString)));
if (status.isFail()) return status;
String code = FLUSH_SYSTEM_OUT + status.getResult() + "\n" + GET_SYSTEM_OUT;
return Status.success(code);
}
@NotNull
public String generateProgramCode(@NotNull JetFile file, @NotNull MainCallParameters mainCallParameters) throws TranslationException {
public Status<String> generateProgramCode(@NotNull JetFile file, @NotNull MainCallParameters mainCallParameters) throws TranslationException {
return generateProgramCode(Collections.singletonList(file), mainCallParameters);
}
@NotNull
public String generateProgramCode(@NotNull List<JetFile> files, @NotNull MainCallParameters mainCallParameters)
public Status<String> generateProgramCode(@NotNull List<JetFile> files, @NotNull MainCallParameters mainCallParameters)
throws TranslationException {
//noinspection unchecked
return generateProgramCode(files, mainCallParameters, new TextOutputImpl(), null, Consumer.EMPTY_CONSUMER);
}
@NotNull
public String generateProgramCode(
public Status<String> generateProgramCode(
@NotNull List<JetFile> files,
@NotNull MainCallParameters mainCallParameters,
@NotNull TextOutputImpl output,
@@ -141,13 +152,15 @@ public final class K2JSTranslator {
@NotNull Consumer<JsNode> astConsumer
) throws TranslationException {
JsProgram program = generateProgram(files, mainCallParameters);
Diagnostics diagnostics = config.getTrace().getBindingContext().getDiagnostics();
JsSourceGenerationVisitor sourceGenerator = new JsSourceGenerationVisitor(output, sourceMapBuilder);
program.accept(sourceGenerator);
if (hasError(diagnostics)) return Status.fail();
program = JsInliner.process(program);
program.accept(new JsSourceGenerationVisitor(output, sourceMapBuilder));
astConsumer.consume(program);
return output.toString();
return Status.success(output.toString());
}
@NotNull
js/js.translator/src/org/jetbrains/k2js/facade/Status.kt
+42
View File
@@ -0,0 +1,42 @@
/*
* Copyright 2010-2014 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.k2js.facade
import kotlin.platform.platformStatic
public class Status<out T> private (private val _result: T, private val type: Status.Type) {
class object {
platformStatic fun fail<T>(): Status<T> = Status<T>(null, Type.Fail)
platformStatic fun success<T>(value: T): Status<T> = Status(value, Type.Success)
}
public val result: T
get() {
assert(type == Type.Success) { "Getting result from fail status is illegal" }
return _result
}
public fun isFail(): Boolean = type == Type.Fail
public fun isSuccess(): Boolean = type == Type.Success
private enum class Type {
Fail
Success
}
}
js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java
+2 -7
View File
@@ -30,11 +30,7 @@ import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPacka
import org.jetbrains.jet.plugin.MainFunctionDetector;
import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.facade.exceptions.MainFunctionNotFoundException;
import org.jetbrains.k2js.facade.exceptions.TranslationException;
import org.jetbrains.k2js.facade.exceptions.TranslationInternalException;
import org.jetbrains.k2js.facade.exceptions.UnsupportedFeatureException;
import org.jetbrains.k2js.inline.JsInliner;
import org.jetbrains.k2js.facade.exceptions.*;
import org.jetbrains.k2js.translate.callTranslator.CallTranslator;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.StaticContext;
@@ -168,8 +164,7 @@ public final class Translation {
@NotNull Config config)
throws TranslationException {
try {
JsProgram program = doGenerateAst(bindingContext, files, mainCallParameters, moduleDescriptor, config);
return config.isInlineEnabled() ? JsInliner.process(program) : program;
return doGenerateAst(bindingContext, files, mainCallParameters, moduleDescriptor, config);
}
catch (UnsupportedOperationException e) {
throw new UnsupportedFeatureException("Unsupported feature used.", e);