WIP

Author: biboudis

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

@@ -81,6 +81,8 @@ public enum Feature {
         @JEP(number=470, title="PEM Encodings of Cryptographic Objects", status="Preview")
         PEM_API,
         LANGUAGE_MODEL,
+        @JEP(number=999, title="Match Statements", status="First Preview")
+        MATCH_STATEMENTS(),
         /**
          * A key for testing.
          */

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

@@ -25,6 +25,8 @@
 
 package com.sun.source.tree;
 
+import jdk.internal.javac.PreviewFeature;
+
 /**
  * A tree node for an "enhanced" {@code for} loop statement.
  *
@@ -41,12 +43,37 @@
  * @since 1.6
  */
 public interface EnhancedForLoopTree extends StatementTree {
+    /**
+     * "Enhanced" {@code for} declarations come in two forms:
+     * <ul>
+     * <li> local variable declarations and
+     * <li> record patterns
+     * </ul>
+     *
+     * @since 26
+     */
+    @PreviewFeature(feature=PreviewFeature.Feature.MATCH_STATEMENTS, reflective=true)
+    public enum DeclarationKind {
+        /** enum constant for local variable declarations */
+        VARIABLE,
+        /** enum constant for record pattern declarations */
+        PATTERN
+    }
+
     /**
      * Returns the control variable for the loop.
-     * @return the control variable
+     * @return the control variable, or {@code null} if this "enhanced" {@code for} uses a pattern
      */
     VariableTree getVariable();
 
+    /**
+     * Returns the control variable or pattern for the loop.
+     * @return the control variable or pattern
+     * @since 26
+     */
+    @PreviewFeature(feature=PreviewFeature.Feature.MATCH_STATEMENTS, reflective=true)
+    Tree getVariableOrRecordPattern();
+
     /**
      * Returns the expression yielding the values for the control variable.
      * @return the expression
@@ -58,4 +85,12 @@ public interface EnhancedForLoopTree extends StatementTree {
      * @return the body of the loop
      */
     StatementTree getStatement();
-}
+
+    /**
+     * Returns the kind of the declaration of the "enhanced" {@code for}.
+     * @return the kind of the declaration
+     * @since 20
+     */
+    @PreviewFeature(feature=PreviewFeature.Feature.MATCH_STATEMENTS, reflective=true)
+    DeclarationKind getDeclarationKind();
+}

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2005, 2014, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package com.sun.source.tree;
+
+import jdk.internal.javac.PreviewFeature;
+
+/**
+ * A tree node for a "match" {@code match} statement.
+ *
+ * For example:
+ * <pre>
+ *   match <em>record pattern</em> = <em>expression</em>;
+ * </pre>
+ *
+ * @jls 14.23.1 match statements
+ *
+ * @author Angelos Bimpoudis
+ * @since 21
+ */
+public interface MatchStatementTree extends StatementTree {
+    /**
+     * Returns the pattern for the match statement.
+     * @return pattern
+     */
+    @PreviewFeature(feature=PreviewFeature.Feature.MATCH_STATEMENTS, reflective=true)
+    Tree getPattern();
+
+    /**
+     * Returns the expression to be matched.
+     * @return the expression
+     */
+    @PreviewFeature(feature=PreviewFeature.Feature.MATCH_STATEMENTS, reflective=true)
+    ExpressionTree getExpression();
+}

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

@@ -78,6 +78,11 @@ public enum Kind {
          */
         ASSERT(AssertTree.class),
 
+        /**
+         * Used for instances of {@link MatchStatementTree}.
+         */
+        MATCH_STATEMENT(MatchStatementTree.class),
+
         /**
          * Used for instances of {@link AssignmentTree}.
          */

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

@@ -89,6 +89,14 @@ public interface TreeVisitor<R,P> {
      */
     R visitAssert(AssertTree node, P p);
 
+    /**
+     * Visits an {@code MatchStatementTree} node.
+     * @param node the node being visited
+     * @param p a parameter value
+     * @return a result value
+     */
+    R visitMatchStatement(MatchStatementTree node, P p);
+
     /**
      * Visits an {@code AssignmentTree} node.
      * @param node the node being visited

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

@@ -475,6 +475,20 @@ public R visitAssert(AssertTree node, P p) {
         return defaultAction(node, p);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation calls {@code defaultAction}.
+     *
+     * @param node {@inheritDoc}
+     * @param p {@inheritDoc}
+     * @return  the result of {@code defaultAction}
+     */
+    @Override
+    public R visitMatchStatement(MatchStatementTree node, P p) {
+        return defaultAction(node, p);
+    }
+
     /**
      * {@inheritDoc}
      *

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

@@ -332,12 +332,28 @@ public R visitForLoop(ForLoopTree node, P p) {
      */
     @Override
     public R visitEnhancedForLoop(EnhancedForLoopTree node, P p) {
-        R r = scan(node.getVariable(), p);
+        R r = scan(node.getVariableOrRecordPattern(), p);
         r = scanAndReduce(node.getExpression(), p, r);
         r = scanAndReduce(node.getStatement(), p, r);
         return r;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @implSpec This implementation scans the children in left to right order.
+     *
+     * @param node  {@inheritDoc}
+     * @param p  {@inheritDoc}
+     * @return the result of scanning
+     */
+    @Override
+    public R visitMatchStatement(MatchStatementTree node, P p) {
+        R r = scan(node.getPattern(), p);
+        r = scanAndReduce(node.getExpression(), p, r);
+        return r;
+    }
+
     /**
      * {@inheritDoc}
      *

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

@@ -212,6 +212,7 @@ public boolean isEnabled() {
     public boolean isPreview(Feature feature) {
         return switch (feature) {
             case PRIMITIVE_PATTERNS -> true;
+            case MATCH_STATEMENTS -> true;
             //Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
             //When real preview features will be added, this method can be implemented to return 'true'
             //for those selected features, and 'false' for all the others.

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

@@ -277,6 +277,7 @@ public enum Feature {
         JAVA_BASE_TRANSITIVE(JDK25, Fragments.FeatureJavaBaseTransitive, DiagKind.PLURAL),
         PRIVATE_MEMBERS_IN_PERMITS_CLAUSE(JDK19),
         ERASE_POLY_SIG_RETURN_TYPE(JDK24),
+        MATCH_STATEMENTS(JDK26, Fragments.FeatureMatchStatements, DiagKind.PLURAL),
         ;
 
         enum DiagKind {

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

@@ -191,6 +191,7 @@ public static Symtab instance(Context context) {
     public final Type incompatibleClassChangeErrorType;
     public final Type cloneNotSupportedExceptionType;
     public final Type matchExceptionType;
+    public final Type nullPointerExceptionType;
     public final Type annotationType;
     public final TypeSymbol enumSym;
     public final Type listType;
@@ -570,6 +571,7 @@ public <R, P> R accept(ElementVisitor<R, P> v, P p) {
         incompatibleClassChangeErrorType = enterClass("java.lang.IncompatibleClassChangeError");
         cloneNotSupportedExceptionType = enterClass("java.lang.CloneNotSupportedException");
         matchExceptionType = enterClass("java.lang.MatchException");
+        nullPointerExceptionType = enterClass("java.lang.NullPointerException");
         annotationType = enterClass("java.lang.annotation.Annotation");
         classLoaderType = enterClass("java.lang.ClassLoader");
         enumSym = enterClass(java_base, names.java_lang_Enum);