Skip to content

Commit

Permalink
[batch compiler] Unrecognized option : --patch-module
Browse files Browse the repository at this point in the history 
detect some errors
+ promote module not found to regular compile error
  • Loading branch information
@stephan-herrmann
stephan-herrmann committed Jun 13, 2024
1 parent 235fcd8 commit 51243db
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 14 deletions.
15 changes: 13 additions & 2 deletions ....compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,19 @@ public ModuleBinding module(LookupEnvironment environment) {
}
if (this.compilationResult != null) {
ICompilationUnit compilationUnit = this.compilationResult.compilationUnit;
if (compilationUnit != null)
return compilationUnit.module(environment);
if (compilationUnit != null) {
ModuleBinding module = compilationUnit.module(environment);
if (module == null) {
ReferenceContext save = environment.problemReporter.referenceContext;
try {
environment.problemReporter.referenceContext = this;
environment.problemReporter.moduleNotFound(this, compilationUnit.getModuleName());
} finally {
environment.problemReporter.referenceContext = save;
}
}
return module;
}
}
return environment.module;
}
Expand Down
5 changes: 1 addition & 4 deletions ....jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/batch/CompilationUnit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,7 @@ public char[] getModuleName() {
public ModuleBinding module(LookupEnvironment rootEnvironment) {
if (this.moduleBinding != null)
return this.moduleBinding;
this.moduleBinding = rootEnvironment.getModule(this.module);
if (this.moduleBinding == null)
throw new IllegalStateException("Module should be known"); //$NON-NLS-1$
return this.moduleBinding;
return this.moduleBinding = rootEnvironment.getModule(this.module);
}
@Override
public String getDestinationPath() {
Expand Down
25 changes: 17 additions & 8 deletions org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/batch/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3382,6 +3382,18 @@ public CompilationUnit[] getCompilationUnits() {
int[] orderedIndex = IntStream.range(0, fileCount).boxed().sorted((i1, i2) -> {
return this.filenames[i1].compareTo(this.filenames[i2]);
}).mapToInt(i -> i).toArray();
Map<String, String> location2patchedModule = new HashMap<>();
if (this.patchModules != null) {
for (Entry<String, String> entry : this.patchModules.entrySet()) {
StringTokenizer tokenizer = new StringTokenizer(entry.getValue(), File.pathSeparator);
while (tokenizer.hasMoreTokens()) {
String location = tokenizer.nextToken();
if (location2patchedModule.put(location, entry.getKey()) != null) {
throw new IllegalArgumentException(this.bind("configure.duplicateLocationPatchModule", location)); //$NON-NLS-1$
}
}
}
}
for (int round = 0; round < 2; round++) {
for (int i : orderedIndex) {
char[] charName = this.filenames[i].toCharArray();
Expand Down Expand Up @@ -3423,15 +3435,12 @@ public CompilationUnit[] getCompilationUnits() {
};
}
String modName = this.modNames[i];
if (modName == null && this.patchModules != null) {
if (modName == null) {
// does this source file patch an existing module?
patchEntries: for (Entry<String, String> entry : this.patchModules.entrySet()) {
StringTokenizer tokenizer = new StringTokenizer(entry.getValue(), File.pathSeparator);
while (tokenizer.hasMoreTokens()) {
if (fileName.startsWith(tokenizer.nextToken()+File.separator)) {
modName = entry.getKey();
break patchEntries;
}
patchEntries: for (Entry<String, String> entry : location2patchedModule.entrySet()) {
if (fileName.startsWith(entry.getKey()+File.separator)) {
modName = entry.getValue();
break patchEntries;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions ...e.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/batch/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ configure.invalidModuleDescriptor = cannot open the module descriptor from {0}
configure.invalidModuleOption = incorrectly formatted option: {0}
configure.duplicateExport = can specify a package in a module only once with --add-export
configure.duplicatePatchModule = duplicate module in --patch-module: {0}
configure.duplicateLocationPatchModule = location {0} is specified more than once in --patch-module
configure.invalidSyntaxPatchModule = invalid syntax for --patch-module: {0}
configure.OneOfModuleOrSourcePath = cannot specify both -source-path and --module-source-path
configure.duplicateBootClasspath = duplicate bootclasspath specification: {0}
Expand Down
5 changes: 5 additions & 0 deletions ...dt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11591,6 +11591,11 @@ public void invalidModule(ModuleReference ref) {
String[] args = new String[] { CharOperation.charToString(ref.moduleName) };
this.handle(IProblem.UndefinedModule, args, args, ref.sourceStart, ref.sourceEnd);
}
public void moduleNotFound(CompilationUnitDeclaration compilationUnitDeclaration, char[] moduleName) {
String[] args = new String[] { String.valueOf(moduleName) };
ASTNode location = (compilationUnitDeclaration.currentPackage != null) ? compilationUnitDeclaration.currentPackage : compilationUnitDeclaration;
handle(IProblem.UndefinedModule, args, args, location.sourceStart, location.sourceEnd);
}
public void missingModuleAddReads(char[] requiredModuleName) {
String[] args = new String[] { new String(requiredModuleName) };
this.handle(IProblem.UndefinedModuleAddReads, args, args, 0, 0);
Expand Down
132 changes: 132 additions & 0 deletions ...s.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ModuleCompilationTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6022,4 +6022,136 @@ public void testPatchModuleSingle() {
"",
false);
}

public void testPatchModuleSingle_duplicateModule() {
File outputDirectory = new File(OUTPUT_DIR);
Util.flushDirectoryContent(outputDirectory);
String src1 = OUTPUT_DIR + File.separator + "src1";
String src2 = OUTPUT_DIR + File.separator + "src2";
List<String> files = new ArrayList<>();
writeFileCollecting(files, src1 + File.separator + "test1",
"A.java",
"package test1;\n" +
"public class A {}");
StringBuilder buffer = new StringBuilder();
buffer.append(" -9 ")
.append(" -proc:none ")
.append(" --patch-module mod.one=\"").append(src1).append("\" ")
.append(" --patch-module mod.one=\"").append(src2).append("\" ")
.append(" --module-path \"").append(Util.getJavaClassLibsAsString()).append("\" ");
runNegativeModuleTest(
files,
buffer,
"",
"duplicate module in --patch-module: mod.one\n",
false,
"--patch-module specified more than once");
}

public void testPatchModuleSingle_duplicateLocation1() {
File outputDirectory = new File(OUTPUT_DIR);
Util.flushDirectoryContent(outputDirectory);
String src1 = OUTPUT_DIR + File.separator + "src1";
List<String> files = new ArrayList<>();
writeFileCollecting(files, src1 + File.separator + "test1",
"A.java",
"package test1;\n" +
"public class A {}");
StringBuilder buffer = new StringBuilder();
buffer.append(" -9 ")
.append(" -proc:none ")
.append(" --patch-module mod.one=\"").append(src1).append("\"")
.append(File.pathSeparatorChar).append("\"").append(src1).append("\" ")
.append(" --module-path \"").append(Util.getJavaClassLibsAsString()).append("\" ");
runNegativeModuleTest(
files,
buffer,
"",
"location ---OUTPUT_DIR_PLACEHOLDER---/src1 is specified more than once in --patch-module\n",
false,
"",
"",
JavacTestOptions.SKIP);
}

public void testPatchModuleSingle_duplicateLocation2() {
File outputDirectory = new File(OUTPUT_DIR);
Util.flushDirectoryContent(outputDirectory);
String src1 = OUTPUT_DIR + File.separator + "src1";
List<String> files = new ArrayList<>();
writeFileCollecting(files, src1 + File.separator + "test1",
"A.java",
"package test1;\n" +
"public class A {}");
StringBuilder buffer = new StringBuilder();
buffer.append(" -9 ")
.append(" -proc:none ")
.append(" --patch-module mod.one=\"").append(src1).append("\" ")
.append(" --patch-module mod.two=\"").append(src1).append("\" ")
.append(" --module-path \"").append(Util.getJavaClassLibsAsString()).append("\" ");
runNegativeModuleTest(
files,
buffer,
"",
"location ---OUTPUT_DIR_PLACEHOLDER---/src1 is specified more than once in --patch-module\n",
false,
"",
"",
JavacTestOptions.SKIP);
}

public void testPatchModuleSingle_syntaxErr() {
File outputDirectory = new File(OUTPUT_DIR);
Util.flushDirectoryContent(outputDirectory);
String src1 = OUTPUT_DIR + File.separator + "src1";
String src2 = OUTPUT_DIR + File.separator + "src2";
List<String> files = new ArrayList<>();
writeFileCollecting(files, src1 + File.separator + "test1",
"A.java",
"package test1;\n" +
"public class A {}");
StringBuilder buffer = new StringBuilder();
buffer.append(" -9 ")
.append(" -proc:none ")
.append(" --patch-module mod.one \"").append(src1).append("\" ")
.append(" --module-path \"").append(Util.getJavaClassLibsAsString()).append("\" ");
runNegativeModuleTest(
files,
buffer,
"",
"invalid syntax for --patch-module: mod.one\n",
false,
"bad value for --patch-module option");
}

public void testPatchModuleSingle_noSuchModule() {
File outputDirectory = new File(OUTPUT_DIR);
Util.flushDirectoryContent(outputDirectory);
String src1 = OUTPUT_DIR + File.separator + "src1";
List<String> files = new ArrayList<>();
writeFileCollecting(files, src1 + File.separator + "test1",
"A.java",
"package test1;\n" +
"public class A {}");
StringBuilder buffer = new StringBuilder();
buffer.append(" -9 ")
.append(" -proc:none ")
.append(" --patch-module mod.one=\"").append(src1).append("\" ")
.append(" --module-path \"").append(Util.getJavaClassLibsAsString()).append("\" ");
runNegativeModuleTest(
files,
buffer,
"",
"""
----------
1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/src1/test1/A.java (at line 1)
package test1;
^^^^^
mod.one cannot be resolved to a module
----------
1 problem (1 error)
""",
false,
"module not found");
}
}

0 comments on commit 51243db

Please sign in to comment.