archive-gh-me/jsweet
1
0
Fork 0
mirror of https://github.com/cincheo/jsweet.git synced 2025-12-15 15:29:22 +00:00
Code Issues Projects Releases Wiki Activity

fixed extra input

Browse Source
This commit is contained in:
Renaud Pawlak 2020-02-17 08:40:07 +01:00
parent c23f7e3ec6
commit 8435393aaf
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transpiler/src/main/java/org/jsweet/JSweetCommandLineLauncher.java
View File

@ -808,8 +808,8 @@ public class JSweetCommandLineLauncher {
transpiler.addTsDefDir(f);
}
transpiler.transpile(transpilationHandler, SourceFile.toSourceFiles(extraJavaInputFiles),
SourceFile.toSourceFiles(javaInputFiles));
transpiler.transpile(transpilationHandler, extraJavaInputFiles.stream().map(f -> f.toString())
.collect(Collectors.toSet()), SourceFile.toSourceFiles(javaInputFiles));
} catch (NoClassDefFoundError error) {
transpilationHandler.report(JSweetProblem.JAVA_COMPILER_NOT_FOUND, null,
JSweetProblem.JAVA_COMPILER_NOT_FOUND.getMessage());

2
transpiler/src/main/java/org/jsweet/transpiler/JSweetContext.java
View File

@ -703,7 +703,7 @@ public class JSweetContext extends Context {
* of the extra input (not generated).
*/
public boolean isExcludedSourcePath(String sourcePath) {
return excludedSourcePaths.contains(sourcePath);
return excludedSourcePaths != null && excludedSourcePaths.contains(sourcePath);
}
/**

13
transpiler/src/main/java/org/jsweet/transpiler/JSweetTranspiler.java
View File

@ -36,6 +36,7 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.LinkedHashSet;
@ -707,7 +708,7 @@ public class JSweetTranspiler implements JSweetOptions {
} else {
if (!areAllTranspiled(sourceFiles)) {
ErrorCountTranspilationHandler errorHandler = new ErrorCountTranspilationHandler(transpilationHandler);
transpile(errorHandler, sourceFiles);
transpile(errorHandler, Collections.emptySet(), sourceFiles);
if (errorHandler.getErrorCount() > 0) {
throw new Exception("unable to evaluate: transpilation errors remain");
}
@ -821,14 +822,14 @@ public class JSweetTranspiler implements JSweetOptions {
*
* @param transpilationHandler
* the log handler
* @param doNotGenerateFiles
* @param excludedSourcePaths
* these files will be used in the transpilation process but will
* not generated any corresponding transpiled artefacts
* @param files
* the files to be transpiled
* @throws IOException
*/
synchronized public void transpile(TranspilationHandler transpilationHandler, SourceFile[] doNotGenerateFiles,
synchronized public void transpile(TranspilationHandler transpilationHandler, Set<String> excludedSourcePaths,
SourceFile... files) throws IOException {
transpilationStartTimestamp = System.currentTimeMillis();
@ -849,7 +850,7 @@ public class JSweetTranspiler implements JSweetOptions {
.filter(source -> source.getJavaFile() != null).collect(toList());
long startJava2TsTimeNanos = System.nanoTime();
java2ts(errorHandler, doNotGenerateFiles, jsweetSources.toArray(new SourceFile[0]));
java2ts(errorHandler, excludedSourcePaths, jsweetSources.toArray(new SourceFile[0]));
long endJava2TsTimeNanos = System.nanoTime();
long startTs2JsTimeNanos = System.nanoTime();
@ -895,7 +896,7 @@ public class JSweetTranspiler implements JSweetOptions {
}
}
private void java2ts(ErrorCountTranspilationHandler transpilationHandler, SourceFile[] doNotGenerateFiles,
private void java2ts(ErrorCountTranspilationHandler transpilationHandler, Set<String> excludedSourcePaths,
SourceFile[] files) throws IOException {
List<JCCompilationUnit> compilationUnits = setupCompiler(Arrays.asList(SourceFile.toFiles(files)),
transpilationHandler);
@ -915,7 +916,7 @@ public class JSweetTranspiler implements JSweetOptions {
}
context.sourceFiles = files;
context.excludedSourcePaths = Stream.of(doNotGenerateFiles).map(f -> f.toString()).collect(Collectors.toSet());
context.excludedSourcePaths = excludedSourcePaths;
factory.createBeforeTranslationScanner(transpilationHandler, context).process(compilationUnits);

3
transpiler/src/test/java/org/jsweet/test/transpiler/util/TranspilerTestRunner.java
View File

@ -6,6 +6,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Collections;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@ -126,7 +127,7 @@ public class TranspilerTestRunner {
TestTranspilationHandler logHandler = new TestTranspilationHandler();
transpiler.setModuleKind(moduleKind);
transpiler.setTsOutputDir(getTsOutputDir(moduleKind, transpiler.isBundle()));
transpiler.transpile(logHandler, files);
transpiler.transpile(logHandler, Collections.emptySet(), files);
if (assertions != null) {
assertions.accept(logHandler);
}