diff -r 5b137cb11cf5 src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Thu Jul 28 15:44:24 2016 +0200 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Fri Jul 29 14:27:32 2016 +0530 @@ -176,6 +176,11 @@ FINALLY("finally"), /** + * Warn about module system related issues. + */ + MODULE("module"), + + /** * Warn about issues relating to use of command line options */ OPTIONS("options"), diff -r 5b137cb11cf5 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Thu Jul 28 15:44:24 2016 +0200 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Fri Jul 29 14:27:32 2016 +0530 @@ -4413,6 +4413,7 @@ Lint prevLint = chk.setLint(lint); try { + chk.checkModuleName(tree); chk.checkDeprecatedModules(tree); } finally { chk.setLint(prevLint); diff -r 5b137cb11cf5 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Thu Jul 28 15:44:24 2016 +0200 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Fri Jul 29 14:27:32 2016 +0530 @@ -35,6 +35,7 @@ import com.sun.tools.javac.jvm.*; import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.resources.CompilerProperties.Fragments; +import com.sun.tools.javac.resources.CompilerProperties.Warnings; import com.sun.tools.javac.tree.*; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag; @@ -2096,6 +2097,18 @@ } } + public void checkModuleName (JCModuleDecl tree) { + Name moduleName = tree.sym.name; + Assert.checkNonNull(moduleName); + if (lint.isEnabled(LintCategory.MODULE)) { + String moduleNameString = moduleName.toString(); + int nameLength = moduleNameString.length(); + if (nameLength > 0 && Character.isDigit(moduleNameString.charAt(nameLength - 1))) { + log.warning(Lint.LintCategory.MODULE, tree.qualId.pos(), Warnings.PoorChoiceForModuleName(moduleName)); + } + } + } + private boolean checkNameClash(ClassSymbol origin, Symbol s1, Symbol s2) { ClashFilter cf = new ClashFilter(origin.type); return (cf.accepts(s1) && diff -r 5b137cb11cf5 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jul 28 15:44:24 2016 +0200 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Jul 29 14:27:32 2016 +0530 @@ -1434,6 +1434,10 @@ compiler.warn.finally.cannot.complete=\ finally clause cannot complete normally +# 0: name +compiler.warn.poor.choice.for.module.name=\ + module name {0} should avoid terminal digits + # 0: symbol, 1: symbol compiler.warn.has.been.deprecated=\ {0} in {1} has been deprecated diff -r 5b137cb11cf5 src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Thu Jul 28 15:44:24 2016 +0200 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Fri Jul 29 14:27:32 2016 +0530 @@ -198,6 +198,9 @@ javac.opt.Xlint.desc.finally=\ Warn about finally clauses that do not terminate normally. +javac.opt.Xlint.desc.module=\ + Warn about module system related issues. + javac.opt.Xlint.desc.options=\ Warn about issues relating to use of command line options. diff -r 5b137cb11cf5 test/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/diags/examples/PoorChoiceForModuleName/module-info.java Fri Jul 29 14:27:32 2016 +0530 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// key: compiler.warn.poor.choice.for.module.name +// options: -Xlint:module + +module mango19 {} diff -r 5b137cb11cf5 test/tools/javac/modules/PoorChoiceForModuleNameTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/modules/PoorChoiceForModuleNameTest.java Fri Jul 29 14:27:32 2016 +0530 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8160181 + * @summary Add lint warning for digits in module names + * @library /tools/lib + * @modules + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.code + * jdk.compiler/com.sun.tools.javac.main + * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase + * @run main PoorChoiceForModuleNameTest + */ + + +import java.nio.file.Path; + +import toolbox.JavacTask; +import toolbox.Task; + +public class PoorChoiceForModuleNameTest extends ModuleTestBase { + + public static void main(String... args) throws Exception { + new PoorChoiceForModuleNameTest().runTests(); + } + + @Test + public void testDigitsInModuleNames(Path base) throws Exception { + + Path src = base.resolve("src"); + + // Nitpickable module name + Path src_m1 = src.resolve("mango19"); + tb.writeJavaFiles(src_m1, "module mango19 { }"); + + // Acceptable module name. + Path src_m2 = src.resolve("mango20kg"); + tb.writeJavaFiles(src_m2, "module mango20kg { }"); + + // Nitpickable, but should not due to annotation. + Path src_m3 = src.resolve("mango100"); + tb.writeJavaFiles(src_m3, "@SuppressWarnings(\"module\") module mango100 { }"); + + Path classes = base.resolve("classes"); + tb.createDirectories(classes); + + String log = new JavacTask(tb) + .options("-XDrawDiagnostics", + "-Xlint:module", + "-Werror", + "--module-source-path", src.toString()) + .outdir(classes) + .files(findJavaFiles(src)) + .run(Task.Expect.FAIL) + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + if (!log.contains("module-info.java:1:8: compiler.warn.poor.choice.for.module.name: mango19") || + !log.contains("- compiler.err.warnings.and.werror") || + !log.contains("1 error") || + !log.contains("1 warning")) + throw new Exception("expected output not found: " + log); + } +} \ No newline at end of file