* @@ -16,7 +17,7 @@ import net.sourceforge.pmd.annotation.Experimental; * ** - * @see JEP 405: Record Patterns (Preview) + * @see JEP 432: Record Patterns (Second Preview) */ @Experimental public final class ASTComponentPatternList extends ASTList
*
- * ForeachStatement ::= "for" "(" {@linkplain ASTLocalVariableDeclaration LocalVariableDeclaration} ":" {@linkplain ASTExpression Expression} ")" {@linkplain ASTStatement Statement}
+ * ForeachStatement ::= "for" "(" ( {@linkplain ASTLocalVariableDeclaration LocalVariableDeclaration} | {@linkplain ASTRecordPattern RecordPattern} ) ":" {@linkplain ASTExpression Expression} ")" {@linkplain ASTStatement Statement}
*
*
+ *
+ * Note: Using a {@linkplain ASTRecordPattern RecordPattern} in an enhanced for statement is a Java 20 Preview feature
+ * + * @see JEP 432: Record Patterns (Second Preview) */ public final class ASTForeachStatement extends AbstractStatement implements InternalInterfaces.VariableIdOwner, ASTLoopStatement { diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTGuardedPattern.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTGuardedPattern.java deleted file mode 100644 index 05949f79a3..0000000000 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTGuardedPattern.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -package net.sourceforge.pmd.lang.java.ast; - -import net.sourceforge.pmd.annotation.Experimental; - -/** - * A guarded pattern (JDK17 Preview). This can be found in {@link ASTSwitchLabel}s. - * - *
- *
- * GuardedPattern ::= {@linkplain ASTPattern Pattern} "&&" {@linkplain ASTExpression Expression}
- *
- *
- *
- * @see JEP 406: Pattern Matching for switch (Preview)
- *
- * @deprecated This is not used with java 19 preview anymore. Only valid for java 18 preview.
- */
-@Experimental
-@Deprecated
-public final class ASTGuardedPattern extends AbstractJavaNode implements ASTPattern {
-
- private int parenDepth;
-
- ASTGuardedPattern(int id) {
- super(id);
- }
-
- @Override
- protected * @@ -15,7 +15,8 @@ import net.sourceforge.pmd.annotation.Experimental; * ** - * @see JEP 405: Record Patterns (Preview) + * @see ASTRecordDeclaration + * @see JEP 432: Record Patterns (Second Preview) */ @Experimental public final class ASTRecordPattern extends AbstractJavaNode implements ASTPattern { diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchGuard.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchGuard.java index af173bcba0..995a7ea3e9 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchGuard.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchGuard.java @@ -8,6 +8,7 @@ import net.sourceforge.pmd.annotation.Experimental; /** * A guard for refining a switch case in {@link ASTSwitchLabel}s. + * This is a Java 19 Preview and Java 20 Preview language feature. * *
* @@ -16,7 +17,7 @@ import net.sourceforge.pmd.annotation.Experimental; * ** - * @see JEP 427: Pattern Matching for switch (Third Preview) + * @see JEP 433: Pattern Matching for switch (Fourth Preview) */ @Experimental public final class ASTSwitchGuard extends AbstractJavaNode { diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java index 3c2876861e..1fdf6a135c 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java @@ -12,14 +12,21 @@ import net.sourceforge.pmd.lang.ast.NodeStream; /** * Represents either a {@code case} or {@code default} label inside * a {@linkplain ASTSwitchStatement switch statement} or {@linkplain ASTSwitchExpression expression}. - * Since Java 12, labels may have several expressions. + * Since Java 14, labels may have several expressions. * *
*
* SwitchLabel ::= "case" {@linkplain ASTExpression Expression} ("," {@linkplain ASTExpression Expression} )*
+ * | "case" "null [ "," "default" ]
+ * | "case" ( {@linkplain ASTTypePattern TypePattern} | {@linkplain ASTRecordPattern RecordPattern} )
* | "default"
*
*
+ *
+ * Note: case null and the case patterns are a Java 19 Preview and Java 20 Preview language feature
+ * + * @see JEP 433: Pattern Matching for switch (Fourth Preview) + * @see JEP 432: Record Patterns (Second Preview) */ public final class ASTSwitchLabel extends AbstractJavaNode implements Iterable