Skip to content

Commit c9d23c3

Browse files
biboudislahodajmcimadamoreGavin BiermanBrian Goetz
committedOct 30, 2023
8315532: Compiler Implementation for Unnamed Variables & Patterns
8317221: Implementation for javax.lang.model for Unnamed Variables & Patterns Co-authored-by: Jan Lahoda <jlahoda@openjdk.org> Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org> Co-authored-by: Gavin Bierman <gbierman@openjdk.org> Co-authored-by: Brian Goetz <briangoetz@openjdk.org> Co-authored-by: Joe Darcy <darcy@openjdk.org> Co-authored-by: Aggelos Biboudis <abimpoudis@openjdk.org> Reviewed-by: jlahoda, mcimadamore
·
jdk-25+17jdk-22-ga
1 parent 3934127 commit c9d23c3

38 files changed

+195
-151
lines changed
 

‎src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java

-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ public enum Feature {
7070

7171
@JEP(number=430, title="String Templates")
7272
STRING_TEMPLATES,
73-
@JEP(number=443, title="Unnamed Patterns and Variables")
74-
UNNAMED,
7573
@JEP(number=445, title="Unnamed Classes and Instance Main Methods")
7674
UNNAMED_CLASSES,
7775
@JEP(number=446, title="Scoped Values", status="Preview")

‎src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ public interface VariableElement extends Element {
111111
* @jls 6.1 Declarations
112112
* @jls 14.4 Local Variable Declarations
113113
*
114-
* @since 21
114+
* @since 22
115115
*/
116-
@PreviewFeature(feature=PreviewFeature.Feature.UNNAMED, reflective = true)
117116
default boolean isUnnamed() { return getSimpleName().isEmpty(); }
118117
}

‎src/jdk.compiler/share/classes/com/sun/source/tree/AnyPatternTree.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
*
3939
* @jls 14.30.1 Kinds of Patterns
4040
*
41-
* @since 21
41+
* @since 22
4242
*/
43-
@PreviewFeature(feature=PreviewFeature.Feature.UNNAMED)
4443
public interface AnyPatternTree extends PatternTree {
4544
}

‎src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,8 @@ public enum Kind {
230230
/**
231231
* Used for instances of {@link BindingPatternTree}.
232232
*
233-
* @since 21
233+
* @since 22
234234
*/
235-
@PreviewFeature(feature=PreviewFeature.Feature.UNNAMED)
236235
ANY_PATTERN(AnyPatternTree.class),
237236

238237
/**

‎src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,8 @@ public interface TreeVisitor<R,P> {
273273
* @param node the node being visited
274274
* @param p a parameter value
275275
* @return a result value
276-
* @since 21
276+
* @since 22
277277
*/
278-
@PreviewFeature(feature=PreviewFeature.Feature.UNNAMED)
279278
R visitAnyPattern(AnyPatternTree node, P p);
280279

281280
/**

‎src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -649,10 +649,9 @@ public R visitStringTemplate(StringTemplateTree node, P p) {
649649
* @param node {@inheritDoc}
650650
* @param p {@inheritDoc}
651651
* @return the result of {@code defaultAction}
652-
* @since 21
652+
* @since 22
653653
*/
654654
@Override
655-
@PreviewFeature(feature=PreviewFeature.Feature.UNNAMED)
656655
public R visitAnyPattern(AnyPatternTree node, P p) {
657656
return defaultAction(node, p);
658657
}

‎src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java

-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ public boolean isPreview(Feature feature) {
211211
return switch (feature) {
212212
case STRING_TEMPLATES -> true;
213213
case UNNAMED_CLASSES -> true;
214-
case UNNAMED_VARIABLES -> true;
215214
//Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
216215
//When real preview features will be added, this method can be implemented to return 'true'
217216
//for those selected features, and 'false' for all the others.

‎src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public enum Feature {
247247
STRING_TEMPLATES(JDK21, Fragments.FeatureStringTemplates, DiagKind.PLURAL),
248248
UNNAMED_CLASSES(JDK21, Fragments.FeatureUnnamedClasses, DiagKind.PLURAL),
249249
WARN_ON_ILLEGAL_UTF8(MIN, JDK21),
250-
UNNAMED_VARIABLES(JDK21, Fragments.FeatureUnnamedVariables, DiagKind.PLURAL),
250+
UNNAMED_VARIABLES(JDK22, Fragments.FeatureUnnamedVariables, DiagKind.PLURAL),
251251
;
252252

253253
enum DiagKind {

‎src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ protected Name ident(boolean allowClass, boolean asVariable) {
653653
log.error(DiagnosticFlag.SYNTAX, token.pos, Errors.UseOfUnderscoreNotAllowedWithBrackets);
654654
}
655655
} else {
656-
if (preview.isEnabled() && Feature.UNNAMED_VARIABLES.allowedInSource(source)) {
657-
log.error(DiagnosticFlag.SYNTAX, token.pos, Errors.UseOfUnderscoreNotAllowed);
656+
if (Feature.UNNAMED_VARIABLES.allowedInSource(source)) {
657+
log.error(DiagnosticFlag.SYNTAX, token.pos, Errors.UseOfUnderscoreNotAllowedNonVariable);
658658
} else {
659659
log.error(DiagnosticFlag.SYNTAX, token.pos, Errors.UnderscoreAsIdentifier);
660660
}

‎src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties

+6-2
Original file line numberDiff line numberDiff line change
@@ -3204,8 +3204,12 @@ compiler.err.underscore.as.identifier=\
32043204
as of release 9, ''_'' is a keyword, and may not be used as an identifier
32053205

32063206
compiler.err.use.of.underscore.not.allowed=\
3207-
as of release 21, the underscore keyword ''_'' is only allowed to declare\n\
3208-
unnamed patterns, local variables, exception parameters or lambda parameters
3207+
underscore not allowed here\n\
3208+
as of release 9, ''_'' is a keyword, and may not be used as an identifier\n\
3209+
as of release 22, ''_'' can be used as a name in the declaration of unnamed patterns, local variables, exception parameters or lambda parameters
3210+
3211+
compiler.err.use.of.underscore.not.allowed.non.variable=\
3212+
underscore not allowed here
32093213

32103214
compiler.err.use.of.underscore.not.allowed.with.brackets=\
32113215
the underscore keyword ''_'' is not allowed to be followed by brackets

‎src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java

-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ public void visitPatternCaseLabel(JCPatternCaseLabel tree) {
324324
}
325325

326326
@Override
327-
@PreviewFeature(feature=PreviewFeature.Feature.UNNAMED)
328327
public void visitAnyPattern(JCAnyPattern that) {
329328
}
330329

‎test/langtools/tools/javac/T8312163.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* @test /nodynamiccopyright/
33
* @bug 8312163
44
* @summary Crash in dominance check when compiling unnamed patterns
5-
* @enablePreview
65
* @compile/fail/ref=T8312163.out -XDrawDiagnostics T8312163.java
76
*/
7+
88
public class T8312163 {
99
sealed interface A permits B {}
1010
record B() implements A {}

‎test/langtools/tools/javac/T8312163.out

-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ T8312163.java:33:18: compiler.err.pattern.dominated
44
T8312163.java:39:18: compiler.err.pattern.dominated
55
T8312163.java:49:18: compiler.err.pattern.dominated
66
T8312163.java:54:18: compiler.err.pattern.dominated
7-
- compiler.note.preview.filename: T8312163.java, DEFAULT
8-
- compiler.note.preview.recompile
97
6 errors

‎test/langtools/tools/javac/T8314216.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @test /nodynamiccopyright/
33
* @bug 8314216
44
* @summary Multiple patterns without unnamed variables
5-
* @compile/fail/ref=T8314216.out -XDrawDiagnostics --enable-preview --source ${jdk.version} T8314216.java
5+
* @compile/fail/ref=T8314216.out -XDrawDiagnostics T8314216.java
66
*/
77

88
public class T8314216 {

‎test/langtools/tools/javac/T8314216.out

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
T8314216.java:13:23: compiler.err.invalid.case.label.combination
22
T8314216.java:14:28: compiler.err.invalid.case.label.combination
3-
- compiler.note.preview.filename: T8314216.java, DEFAULT
4-
- compiler.note.preview.recompile
53
2 errors

‎test/langtools/tools/javac/T8314423.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* @test /nodynamiccopyright/
33
* @bug 8314423
44
* @summary Multiple patterns without unnamed variables
5-
* @compile/fail/ref=T8314423.out -XDrawDiagnostics T8314423.java
6-
* @compile --enable-preview --source ${jdk.version} T8314423.java
5+
* @compile/fail/ref=T8314423.out -XDrawDiagnostics --release 21 T8314423.java
6+
* @compile T8314423.java
77
*/
88

99
public class T8314423 {

‎test/langtools/tools/javac/T8314423.out

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
T8314423.java:15:24: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.unnamed.variables)
2-
1 error
1+
T8314423.java:15:24: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.unnamed.variables), 21, 22
2+
1 error

‎test/langtools/tools/javac/TryWithResources/TwrLintUnderscore.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
* @test /nodynamiccopyright/
33
* @bug 8304246
44
* @summary Compiler Implementation for Unnamed patterns and variables
5-
* @enablePreview
6-
* @compile/ref=TwrLintUnderscore.out --enable-preview -source ${jdk.version} -Xlint:try -XDrawDiagnostics TwrLintUnderscore.java
5+
* @compile -Xlint:try -XDrawDiagnostics TwrLintUnderscore.java
76
*/
87
class TwrLintUnderscore implements AutoCloseable {
98
private static void test1() {

‎test/langtools/tools/javac/TryWithResources/TwrLintUnderscore.out

-2
This file was deleted.

‎test/langtools/tools/javac/diags/examples/UnderscoreAsIdentifierError.java

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323

2424
// key: compiler.err.underscore.as.identifier
25+
// options: --release 21
2526

2627
class UnderscoreAsIdentifierError {
2728
String _ = null;

‎test/langtools/tools/javac/diags/examples/UnderscoreInLambdaExpression.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
* questions.
2222
*/
2323

24+
// key: compiler.err.feature.not.supported.in.source.plural
2425
// key: compiler.misc.feature.unnamed.variables
25-
// key: compiler.warn.preview.feature.use.plural
26-
// options: --enable-preview -source ${jdk.version} -Xlint:preview
26+
// key: compiler.warn.source.no.system.modules.path
27+
// options: -source 21
2728

2829
public class UnderscoreInLambdaExpression {
2930
java.util.function.Function<String,String> f = _ -> "x";

‎test/langtools/tools/javac/diags/examples/UnnamedVariables.java

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
// key: compiler.err.feature.not.supported.in.source.plural
25+
// key: compiler.misc.feature.unnamed.variables
26+
// options: -Xlint:-options --source 21
27+
28+
class UnnamedVariables {
29+
void test() {
30+
String _ = null;
31+
}
32+
}

‎test/langtools/tools/javac/diags/examples/UseOfUnderscoreNotAllowed.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
*/
2323

2424
// key: compiler.err.use.of.underscore.not.allowed
25-
// options: --enable-preview -source ${jdk.version} -Xlint:preview
26-
27-
import java.util.function.*;
2825

2926
class UseOfUnderscoreNotAllowed {
30-
IntBinaryOperator f = (int x, int y) -> _ + x;
27+
private int a = 0, _ = 1;
3128
}

‎test/langtools/tools/javac/diags/examples/UseOfUnderscoreNotAllowedNonVar.java

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
// key: compiler.err.use.of.underscore.not.allowed.non.variable
25+
26+
import java.util.function.*;
27+
28+
class UseOfUnderscoreNotAllowedNonVar {
29+
IntBinaryOperator f = (int x, int y) -> _ + x;
30+
}

‎test/langtools/tools/javac/diags/examples/UseOfUnderscoreNotAllowedWithBrackets.java

-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
*/
2323

2424
// key: compiler.err.use.of.underscore.not.allowed.with.brackets
25-
// key: compiler.misc.feature.unnamed.variables
26-
// key: compiler.warn.preview.feature.use.plural
27-
// options: --enable-preview -source ${jdk.version} -Xlint:preview
2825

2926
class UseOfUnderscoreNotAllowedWithBrackets {
3027
void test() {

‎test/langtools/tools/javac/lambda/IdentifierTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* @author sogoel
55
* @summary Test generation of warnings when '_' is used an identifier
66
* @compile/fail/ref=IdentifierTest8.out --release 8 -Werror -XDrawDiagnostics -Xlint:-options IdentifierTest.java
7-
* @compile/fail/ref=IdentifierTest9.out -XDrawDiagnostics IdentifierTest.java
8-
* @compile/fail/ref=IdentifierTest21.out -source ${jdk.version} --enable-preview -XDrawDiagnostics IdentifierTest.java
7+
* @compile/fail/ref=IdentifierTest9.out --release 9 -XDrawDiagnostics IdentifierTest.java
8+
* @compile/fail/ref=IdentifierTest22.out -XDrawDiagnostics IdentifierTest.java
99
*/
1010

1111
import java.util.List;

‎test/langtools/tools/javac/lambda/IdentifierTest21.out ‎test/langtools/tools/javac/lambda/IdentifierTest22.out

+36-38
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
1-
IdentifierTest.java:42:11: compiler.err.use.of.underscore.not.allowed
2-
IdentifierTest.java:45:16: compiler.err.use.of.underscore.not.allowed
3-
IdentifierTest.java:47:22: compiler.err.use.of.underscore.not.allowed
4-
IdentifierTest.java:52:13: compiler.err.use.of.underscore.not.allowed
5-
IdentifierTest.java:52:23: compiler.err.use.of.underscore.not.allowed
6-
IdentifierTest.java:54:13: compiler.err.use.of.underscore.not.allowed
7-
IdentifierTest.java:56:13: compiler.err.use.of.underscore.not.allowed
8-
IdentifierTest.java:64:67: compiler.err.use.of.underscore.not.allowed
9-
IdentifierTest.java:71:13: compiler.err.use.of.underscore.not.allowed
10-
IdentifierTest.java:72:14: compiler.err.use.of.underscore.not.allowed
11-
IdentifierTest.java:73:18: compiler.err.use.of.underscore.not.allowed
12-
IdentifierTest.java:80:13: compiler.err.use.of.underscore.not.allowed
13-
IdentifierTest.java:80:15: compiler.err.use.of.underscore.not.allowed
14-
IdentifierTest.java:82:13: compiler.err.use.of.underscore.not.allowed
15-
IdentifierTest.java:82:15: compiler.err.use.of.underscore.not.allowed
16-
IdentifierTest.java:89:10: compiler.err.use.of.underscore.not.allowed
17-
IdentifierTest.java:89:38: compiler.err.use.of.underscore.not.allowed
18-
IdentifierTest.java:95:14: compiler.err.use.of.underscore.not.allowed
19-
IdentifierTest.java:102:17: compiler.err.use.of.underscore.not.allowed
20-
IdentifierTest.java:102:26: compiler.err.use.of.underscore.not.allowed
21-
IdentifierTest.java:119:20: compiler.err.use.of.underscore.not.allowed
22-
IdentifierTest.java:124:10: compiler.err.use.of.underscore.not.allowed
23-
IdentifierTest.java:129:17: compiler.err.use.of.underscore.not.allowed
24-
IdentifierTest.java:132:17: compiler.err.use.of.underscore.not.allowed
25-
IdentifierTest.java:139:24: compiler.err.use.of.underscore.not.allowed
26-
IdentifierTest.java:139:33: compiler.err.use.of.underscore.not.allowed
27-
IdentifierTest.java:140:39: compiler.err.use.of.underscore.not.allowed
28-
IdentifierTest.java:145:15: compiler.err.use.of.underscore.not.allowed
29-
IdentifierTest.java:146:13: compiler.err.use.of.underscore.not.allowed
30-
IdentifierTest.java:151:15: compiler.err.use.of.underscore.not.allowed
31-
IdentifierTest.java:152:17: compiler.err.use.of.underscore.not.allowed
1+
IdentifierTest.java:42:11: compiler.err.use.of.underscore.not.allowed.non.variable
2+
IdentifierTest.java:45:16: compiler.err.use.of.underscore.not.allowed.non.variable
3+
IdentifierTest.java:47:22: compiler.err.use.of.underscore.not.allowed.non.variable
4+
IdentifierTest.java:52:13: compiler.err.use.of.underscore.not.allowed.non.variable
5+
IdentifierTest.java:52:23: compiler.err.use.of.underscore.not.allowed.non.variable
6+
IdentifierTest.java:54:13: compiler.err.use.of.underscore.not.allowed.non.variable
7+
IdentifierTest.java:56:13: compiler.err.use.of.underscore.not.allowed.non.variable
8+
IdentifierTest.java:64:67: compiler.err.use.of.underscore.not.allowed.non.variable
9+
IdentifierTest.java:71:13: compiler.err.use.of.underscore.not.allowed.non.variable
10+
IdentifierTest.java:72:14: compiler.err.use.of.underscore.not.allowed.non.variable
11+
IdentifierTest.java:73:18: compiler.err.use.of.underscore.not.allowed.non.variable
12+
IdentifierTest.java:80:13: compiler.err.use.of.underscore.not.allowed.non.variable
13+
IdentifierTest.java:80:15: compiler.err.use.of.underscore.not.allowed.non.variable
14+
IdentifierTest.java:82:13: compiler.err.use.of.underscore.not.allowed.non.variable
15+
IdentifierTest.java:82:15: compiler.err.use.of.underscore.not.allowed.non.variable
16+
IdentifierTest.java:89:10: compiler.err.use.of.underscore.not.allowed.non.variable
17+
IdentifierTest.java:89:38: compiler.err.use.of.underscore.not.allowed.non.variable
18+
IdentifierTest.java:95:14: compiler.err.use.of.underscore.not.allowed.non.variable
19+
IdentifierTest.java:102:17: compiler.err.use.of.underscore.not.allowed.non.variable
20+
IdentifierTest.java:102:26: compiler.err.use.of.underscore.not.allowed.non.variable
21+
IdentifierTest.java:119:20: compiler.err.use.of.underscore.not.allowed.non.variable
22+
IdentifierTest.java:124:10: compiler.err.use.of.underscore.not.allowed.non.variable
23+
IdentifierTest.java:129:17: compiler.err.use.of.underscore.not.allowed.non.variable
24+
IdentifierTest.java:132:17: compiler.err.use.of.underscore.not.allowed.non.variable
25+
IdentifierTest.java:139:24: compiler.err.use.of.underscore.not.allowed.non.variable
26+
IdentifierTest.java:139:33: compiler.err.use.of.underscore.not.allowed.non.variable
27+
IdentifierTest.java:140:39: compiler.err.use.of.underscore.not.allowed.non.variable
28+
IdentifierTest.java:145:15: compiler.err.use.of.underscore.not.allowed.non.variable
29+
IdentifierTest.java:146:13: compiler.err.use.of.underscore.not.allowed.non.variable
30+
IdentifierTest.java:151:15: compiler.err.use.of.underscore.not.allowed.non.variable
31+
IdentifierTest.java:152:17: compiler.err.use.of.underscore.not.allowed.non.variable
3232
IdentifierTest.java:158:16: compiler.err.use.of.underscore.not.allowed.with.brackets
33-
IdentifierTest.java:160:25: compiler.err.use.of.underscore.not.allowed
34-
IdentifierTest.java:169:5: compiler.err.use.of.underscore.not.allowed
35-
IdentifierTest.java:173:26: compiler.err.use.of.underscore.not.allowed
36-
IdentifierTest.java:175:19: compiler.err.use.of.underscore.not.allowed
37-
IdentifierTest.java:181:11: compiler.err.use.of.underscore.not.allowed
38-
- compiler.note.preview.filename: IdentifierTest.java, DEFAULT
39-
- compiler.note.preview.recompile
33+
IdentifierTest.java:160:25: compiler.err.use.of.underscore.not.allowed.non.variable
34+
IdentifierTest.java:169:5: compiler.err.use.of.underscore.not.allowed.non.variable
35+
IdentifierTest.java:173:26: compiler.err.use.of.underscore.not.allowed.non.variable
36+
IdentifierTest.java:175:19: compiler.err.use.of.underscore.not.allowed.non.variable
37+
IdentifierTest.java:181:11: compiler.err.use.of.underscore.not.allowed.non.variable
4038
37 errors

‎test/langtools/tools/javac/lambda/IdentifierTest9.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
IdentifierTest.java:42:11: compiler.err.underscore.as.identifier
22
IdentifierTest.java:45:16: compiler.err.underscore.as.identifier
3-
IdentifierTest.java:46:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.unnamed.variables)
3+
IdentifierTest.java:46:20: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.unnamed.variables), 9, 22
44
IdentifierTest.java:47:22: compiler.err.underscore.as.identifier
55
IdentifierTest.java:52:13: compiler.err.underscore.as.identifier
66
IdentifierTest.java:52:23: compiler.err.underscore.as.identifier

‎test/langtools/tools/javac/lambda/UnderscoreAsIdent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* @test /nodynamiccopyright/
33
* @summary Check usages of underscore as identifier generate warnings
44
* @compile/fail/ref=UnderscoreAsIdent8.out --release 8 -XDrawDiagnostics -Xlint:-options -Werror UnderscoreAsIdent.java
5-
* @compile/fail/ref=UnderscoreAsIdent9.out -XDrawDiagnostics -Werror UnderscoreAsIdent.java
6-
* @compile/fail/ref=UnderscoreAsIdent21.out -source ${jdk.version} --enable-preview -XDrawDiagnostics UnderscoreAsIdent.java
5+
* @compile/fail/ref=UnderscoreAsIdent9.out --release 9 -XDrawDiagnostics -Werror UnderscoreAsIdent.java
6+
* @compile/fail/ref=UnderscoreAsIdent22.out -XDrawDiagnostics UnderscoreAsIdent.java
77
*/
88
package _._;
99

‎test/langtools/tools/javac/lambda/UnderscoreAsIdent21.out ‎test/langtools/tools/javac/lambda/UnderscoreAsIdent22.out

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
UnderscoreAsIdent.java:8:9: compiler.err.use.of.underscore.not.allowed
2-
UnderscoreAsIdent.java:8:11: compiler.err.use.of.underscore.not.allowed
3-
UnderscoreAsIdent.java:10:8: compiler.err.use.of.underscore.not.allowed
4-
UnderscoreAsIdent.java:10:10: compiler.err.use.of.underscore.not.allowed
5-
UnderscoreAsIdent.java:12:7: compiler.err.use.of.underscore.not.allowed
6-
UnderscoreAsIdent.java:13:12: compiler.err.use.of.underscore.not.allowed
7-
UnderscoreAsIdent.java:14:10: compiler.err.use.of.underscore.not.allowed
8-
UnderscoreAsIdent.java:14:19: compiler.err.use.of.underscore.not.allowed
9-
UnderscoreAsIdent.java:19:25: compiler.err.use.of.underscore.not.allowed
10-
UnderscoreAsIdent.java:19:33: compiler.err.use.of.underscore.not.allowed
11-
UnderscoreAsIdent.java:25:9: compiler.err.use.of.underscore.not.allowed
12-
UnderscoreAsIdent.java:27:19: compiler.err.use.of.underscore.not.allowed
13-
UnderscoreAsIdent.java:29:9: compiler.err.use.of.underscore.not.allowed
14-
UnderscoreAsIdent.java:31:22: compiler.err.use.of.underscore.not.allowed
15-
- compiler.note.preview.filename: UnderscoreAsIdent.java, DEFAULT
16-
- compiler.note.preview.recompile
17-
14 errors
1+
UnderscoreAsIdent.java:8:9: compiler.err.use.of.underscore.not.allowed.non.variable
2+
UnderscoreAsIdent.java:8:11: compiler.err.use.of.underscore.not.allowed.non.variable
3+
UnderscoreAsIdent.java:10:8: compiler.err.use.of.underscore.not.allowed.non.variable
4+
UnderscoreAsIdent.java:10:10: compiler.err.use.of.underscore.not.allowed.non.variable
5+
UnderscoreAsIdent.java:12:7: compiler.err.use.of.underscore.not.allowed.non.variable
6+
UnderscoreAsIdent.java:13:12: compiler.err.use.of.underscore.not.allowed.non.variable
7+
UnderscoreAsIdent.java:14:10: compiler.err.use.of.underscore.not.allowed.non.variable
8+
UnderscoreAsIdent.java:14:19: compiler.err.use.of.underscore.not.allowed.non.variable
9+
UnderscoreAsIdent.java:19:25: compiler.err.use.of.underscore.not.allowed.non.variable
10+
UnderscoreAsIdent.java:19:33: compiler.err.use.of.underscore.not.allowed.non.variable
11+
UnderscoreAsIdent.java:25:9: compiler.err.use.of.underscore.not.allowed.non.variable
12+
UnderscoreAsIdent.java:27:19: compiler.err.use.of.underscore.not.allowed.non.variable
13+
UnderscoreAsIdent.java:29:9: compiler.err.use.of.underscore.not.allowed.non.variable
14+
UnderscoreAsIdent.java:31:22: compiler.err.use.of.underscore.not.allowed.non.variable
15+
14 errors

‎test/langtools/tools/javac/lambda/UnderscoreAsIdent9.out

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ UnderscoreAsIdent.java:12:7: compiler.err.underscore.as.identifier
66
UnderscoreAsIdent.java:13:12: compiler.err.underscore.as.identifier
77
UnderscoreAsIdent.java:14:10: compiler.err.underscore.as.identifier
88
UnderscoreAsIdent.java:14:19: compiler.err.underscore.as.identifier
9-
UnderscoreAsIdent.java:16:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.unnamed.variables)
9+
UnderscoreAsIdent.java:16:16: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.unnamed.variables), 9, 22
1010
UnderscoreAsIdent.java:19:25: compiler.err.underscore.as.identifier
1111
UnderscoreAsIdent.java:19:33: compiler.err.underscore.as.identifier
1212
UnderscoreAsIdent.java:25:9: compiler.err.underscore.as.identifier

‎test/langtools/tools/javac/parser/JavacParserTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2206,7 +2206,7 @@ enum Test {
22062206
/*public static final*/ _ /* = new Test() */ /*enum*/ ;
22072207
} """,
22082208
"""
2209-
Test.java:3:5: compiler.err.underscore.as.identifier
2209+
Test.java:3:5: compiler.err.use.of.underscore.not.allowed.non.variable
22102210
"""),
22112211
new TestCase("""
22122212
package t;
@@ -2241,7 +2241,7 @@ enum Test {
22412241
/*public static final*/ _ /* = new Test() */ /*enum*/ ;
22422242
} """,
22432243
"""
2244-
Test.java:3:5: compiler.err.underscore.as.identifier
2244+
Test.java:3:5: compiler.err.use.of.underscore.not.allowed.non.variable
22452245
"""),
22462246
new TestCase("""
22472247
package t;
@@ -2330,7 +2330,7 @@ enum Test {
23302330
/*public static final*/ A /* = new Test() */ /*enum*/ ;
23312331
} """,
23322332
"""
2333-
Test.java:3:5: compiler.err.underscore.as.identifier
2333+
Test.java:3:5: compiler.err.use.of.underscore.not.allowed.non.variable
23342334
"""),
23352335
};
23362336
for (TestCase testCase : testCases) {

‎test/langtools/tools/javac/patterns/T8314578.out

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
T8314578.java:14:18: compiler.err.flows.through.from.pattern
22
T8314578.java:15:18: compiler.err.flows.through.to.pattern
33
T8314578.java:27:18: compiler.err.flows.through.to.pattern
4-
- compiler.note.preview.filename: T8314578.java, DEFAULT
5-
- compiler.note.preview.recompile
64
3 errors

‎test/langtools/tools/javac/patterns/T8314632.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* @test /nodynamiccopyright/
33
* @bug 8314632
44
* @summary Intra-case dominance check fails in the presence of a guard
5-
* @enablePreview
65
* @compile/fail/ref=T8314632.out -XDrawDiagnostics T8314632.java
76
*/
7+
88
public class T8314632 {
99
void test1(Object obj) {
1010
switch (obj) {

‎test/langtools/tools/javac/patterns/T8314632.out

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
T8314632.java:12:45: compiler.err.pattern.dominated
22
T8314632.java:20:45: compiler.err.pattern.dominated
33
T8314632.java:36:29: compiler.err.pattern.dominated
4-
- compiler.note.preview.filename: T8314632.java, DEFAULT
5-
- compiler.note.preview.recompile
64
3 errors

‎test/langtools/tools/javac/patterns/Unnamed.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
* questions.
2222
*/
2323

24-
/**
24+
/*
2525
* @test
2626
* @bug 8304246
2727
* @summary Compiler Implementation for Unnamed patterns and variables
28-
* @enablePreview
2928
* @compile Unnamed.java
3029
* @run main Unnamed
3130
*/
@@ -98,6 +97,9 @@ private void unnamedTest() {
9897
try (final Lock _ = null) { }
9998
try (@Foo Lock _ = null) { }
10099

100+
try (Lock _ = null) { }
101+
catch (Exception | Error _) { }
102+
101103
String[] strs = new String[] { "str1", "str2" };
102104
for (var _ : strs) {
103105
for (var _ : strs) {

‎test/langtools/tools/javac/patterns/UnnamedErrors.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
/**
1+
/*
22
* @test /nodynamiccopyright/
33
* @bug 8304246 8309093
44
* @summary Compiler Implementation for Unnamed patterns and variables
5-
* @enablePreview
65
* @compile/fail/ref=UnnamedErrors.out -XDrawDiagnostics -XDshould-stop.at=FLOW UnnamedErrors.java
76
*/
87
public class UnnamedErrors {
@@ -111,6 +110,12 @@ void testUnderscoreWithBrackets() {
111110
for (int _[] : new int[][]{new int[]{1}, new int[]{2}}) { }
112111
}
113112

113+
void testUnderscoreInExpression() {
114+
for(String s : _) {
115+
int i = 1;
116+
}
117+
}
118+
114119
class Lock implements AutoCloseable {
115120
@Override
116121
public void close() {}

‎test/langtools/tools/javac/patterns/UnnamedErrors.out

+35-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
1-
UnnamedErrors.java:9:17: compiler.err.use.of.underscore.not.allowed
2-
UnnamedErrors.java:10:17: compiler.err.use.of.underscore.not.allowed
3-
UnnamedErrors.java:11:20: compiler.err.use.of.underscore.not.allowed
4-
UnnamedErrors.java:11:26: compiler.err.use.of.underscore.not.allowed
5-
UnnamedErrors.java:11:32: compiler.err.use.of.underscore.not.allowed
6-
UnnamedErrors.java:12:17: compiler.err.use.of.underscore.not.allowed
1+
UnnamedErrors.java:8:17: compiler.err.use.of.underscore.not.allowed.non.variable
2+
UnnamedErrors.java:9:17: compiler.err.use.of.underscore.not.allowed.non.variable
3+
UnnamedErrors.java:10:20: compiler.err.use.of.underscore.not.allowed
4+
UnnamedErrors.java:10:26: compiler.err.use.of.underscore.not.allowed
5+
UnnamedErrors.java:10:32: compiler.err.use.of.underscore.not.allowed
6+
UnnamedErrors.java:11:17: compiler.err.use.of.underscore.not.allowed.non.variable
7+
UnnamedErrors.java:11:24: compiler.err.use.of.underscore.not.allowed
78
UnnamedErrors.java:12:24: compiler.err.use.of.underscore.not.allowed
8-
UnnamedErrors.java:13:24: compiler.err.use.of.underscore.not.allowed
9-
UnnamedErrors.java:15:18: compiler.err.use.of.underscore.not.allowed
10-
UnnamedErrors.java:16:23: compiler.err.use.of.underscore.not.allowed
11-
UnnamedErrors.java:17:19: compiler.err.use.of.underscore.not.allowed
12-
UnnamedErrors.java:22:26: compiler.err.use.of.underscore.not.allowed
13-
UnnamedErrors.java:24:26: compiler.err.use.of.underscore.not.allowed
14-
UnnamedErrors.java:27:18: compiler.err.use.of.underscore.not.allowed
15-
UnnamedErrors.java:34:18: compiler.err.restricted.type.not.allowed.here: var
16-
UnnamedErrors.java:77:18: compiler.err.use.of.underscore.not.allowed
17-
UnnamedErrors.java:77:19: compiler.err.expected: token.identifier
18-
UnnamedErrors.java:82:40: compiler.err.expected2: :, ->
19-
UnnamedErrors.java:82:51: compiler.err.expected: =
20-
UnnamedErrors.java:82:58: compiler.err.expected: ';'
21-
UnnamedErrors.java:101:14: compiler.err.expected: =
22-
UnnamedErrors.java:102:22: compiler.err.expected: =
23-
UnnamedErrors.java:104:26: compiler.err.expected: =
24-
UnnamedErrors.java:110:13: compiler.err.use.of.underscore.not.allowed.with.brackets
25-
UnnamedErrors.java:111:18: compiler.err.use.of.underscore.not.allowed.with.brackets
26-
UnnamedErrors.java:11:17: compiler.err.already.defined: kindname.variable, x, kindname.class, UnnamedErrors
27-
UnnamedErrors.java:36:13: compiler.err.unconditional.pattern.and.default
28-
UnnamedErrors.java:45:18: compiler.err.pattern.dominated
29-
UnnamedErrors.java:54:29: compiler.err.flows.through.from.pattern
30-
UnnamedErrors.java:61:29: compiler.err.flows.through.from.pattern
31-
UnnamedErrors.java:68:32: compiler.err.flows.through.from.pattern
32-
UnnamedErrors.java:82:56: compiler.err.already.defined: kindname.variable, x2, kindname.method, guardErrors(java.lang.Object,int,int)
33-
UnnamedErrors.java:83:13: compiler.err.switch.mixing.case.types
34-
UnnamedErrors.java:90:30: compiler.err.pattern.dominated
35-
- compiler.note.preview.filename: UnnamedErrors.java, DEFAULT
36-
- compiler.note.preview.recompile
37-
34 errors
9+
UnnamedErrors.java:14:18: compiler.err.use.of.underscore.not.allowed.non.variable
10+
UnnamedErrors.java:15:23: compiler.err.use.of.underscore.not.allowed.non.variable
11+
UnnamedErrors.java:16:19: compiler.err.use.of.underscore.not.allowed.non.variable
12+
UnnamedErrors.java:21:26: compiler.err.use.of.underscore.not.allowed.non.variable
13+
UnnamedErrors.java:23:26: compiler.err.use.of.underscore.not.allowed.non.variable
14+
UnnamedErrors.java:26:18: compiler.err.use.of.underscore.not.allowed.non.variable
15+
UnnamedErrors.java:33:18: compiler.err.restricted.type.not.allowed.here: var
16+
UnnamedErrors.java:76:18: compiler.err.use.of.underscore.not.allowed.non.variable
17+
UnnamedErrors.java:76:19: compiler.err.expected: token.identifier
18+
UnnamedErrors.java:81:40: compiler.err.expected2: :, ->
19+
UnnamedErrors.java:81:51: compiler.err.expected: =
20+
UnnamedErrors.java:81:58: compiler.err.expected: ';'
21+
UnnamedErrors.java:100:14: compiler.err.expected: =
22+
UnnamedErrors.java:101:22: compiler.err.expected: =
23+
UnnamedErrors.java:103:26: compiler.err.expected: =
24+
UnnamedErrors.java:109:13: compiler.err.use.of.underscore.not.allowed.with.brackets
25+
UnnamedErrors.java:110:18: compiler.err.use.of.underscore.not.allowed.with.brackets
26+
UnnamedErrors.java:114:24: compiler.err.use.of.underscore.not.allowed.non.variable
27+
UnnamedErrors.java:10:17: compiler.err.already.defined: kindname.variable, x, kindname.class, UnnamedErrors
28+
UnnamedErrors.java:35:13: compiler.err.unconditional.pattern.and.default
29+
UnnamedErrors.java:44:18: compiler.err.pattern.dominated
30+
UnnamedErrors.java:53:29: compiler.err.flows.through.from.pattern
31+
UnnamedErrors.java:60:29: compiler.err.flows.through.from.pattern
32+
UnnamedErrors.java:67:32: compiler.err.flows.through.from.pattern
33+
UnnamedErrors.java:81:56: compiler.err.already.defined: kindname.variable, x2, kindname.method, guardErrors(java.lang.Object,int,int)
34+
UnnamedErrors.java:82:13: compiler.err.switch.mixing.case.types
35+
UnnamedErrors.java:89:30: compiler.err.pattern.dominated
36+
35 errors

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Oct 30, 2023

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Oct 30, 2023

Review

Issues

Please sign in to comment.