archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8224031: Cannot parse switch expressions after type cast

Browse source 
Correctly categorize parentheses followed by the switch keyword as cast.

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2019-05-16 16:42:14 +02:00
parent c39088c391
commit 08193be19c
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
View file

@ -1655,6 +1655,7 @@ public class JavacParser implements Parser {
case DOUBLELITERAL: case CHARLITERAL: case STRINGLITERAL: case DOUBLELITERAL: case CHARLITERAL: case STRINGLITERAL:
case TRUE: case FALSE: case NULL: case TRUE: case FALSE: case NULL:
case NEW: case IDENTIFIER: case ASSERT: case ENUM: case UNDERSCORE: case NEW: case IDENTIFIER: case ASSERT: case ENUM: case UNDERSCORE:
case SWITCH:
case BYTE: case SHORT: case CHAR: case INT: case BYTE: case SHORT: case CHAR: case INT:
case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID: case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID:
return ParensResult.CAST; return ParensResult.CAST;

6
test/langtools/tools/javac/switchexpr/ExpressionSwitch-old.out
View file

@ -1,4 +1,4 @@
ExpressionSwitch.java:39:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.expressions) ExpressionSwitch.java:40:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.expressions)
ExpressionSwitch.java:40:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules) ExpressionSwitch.java:41:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules)
ExpressionSwitch.java:92:31: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels) ExpressionSwitch.java:93:31: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels)
3 errors 3 errors

10
test/langtools/tools/javac/switchexpr/ExpressionSwitch.java
View file

@ -1,6 +1,6 @@
/* /*
* @test /nodynamiccopyright/ * @test /nodynamiccopyright/
* @bug 8206986 8222169 * @bug 8206986 8222169 8224031
* @summary Check expression switch works. * @summary Check expression switch works.
* @compile/fail/ref=ExpressionSwitch-old.out -source 9 -Xlint:-options -XDrawDiagnostics ExpressionSwitch.java * @compile/fail/ref=ExpressionSwitch-old.out -source 9 -Xlint:-options -XDrawDiagnostics ExpressionSwitch.java
* @compile --enable-preview -source ${jdk.version} ExpressionSwitch.java * @compile --enable-preview -source ${jdk.version} ExpressionSwitch.java
@ -33,6 +33,7 @@ public class ExpressionSwitch {
assertEquals(convert2("C"), 1); assertEquals(convert2("C"), 1);
assertEquals(convert2(""), -1); assertEquals(convert2(""), -1);
localClass(T.A); localClass(T.A);
assertEquals(castSwitchExpressions(T.A), "A");
} }
private String print(T t) { private String print(T t) {
@ -121,6 +122,13 @@ public class ExpressionSwitch {
} }
} }
private String castSwitchExpressions(T t) {
return (String) switch (t) {
case A -> "A";
default -> 1;
};
}
private void check(T t, String expected) { private void check(T t, String expected) {
String result = print(t); String result = print(t);
assertEquals(result, expected); assertEquals(result, expected);