diff -r 66c7a7990f69 -r e04704954553 src/jdk.compiler/share/classes/com/sun/source/tree/DeconstructionPatternTree.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/DeconstructionPatternTree.java Mon Mar 16 17:08:05 2020 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2017, 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 java.util.List;
+
+/**
+ * {@preview Associated with pattern matching for instanceof, a preview feature of
+ * the Java language.
+ *
+ * This interface is associated with pattern matching for instanceof, a preview
+ * feature of the Java language. Preview features
+ * may be removed in a future release, or upgraded to permanent
+ * features of the Java language.}
+ *
+ * A deconstruction pattern tree
+ *
+ * @since 15
+ */
+public interface DeconstructionPatternTree extends PatternTree {
+
+ /**
+ * Returns the deconstructed type.
+ * @return the deconstructed type
+ */
+ Tree getDeconstructor();
+
+ /**
+ * Returns the nested patterns.
+ * @return the nested patterns.
+ */
+ List getNestedPatterns();
+
+}
+
diff -r 66c7a7990f69 -r e04704954553 src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java Thu Mar 12 14:14:29 2020 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java Mon Mar 16 17:08:05 2020 +0100
@@ -235,6 +235,21 @@
BINDING_PATTERN(BindingPatternTree.class),
/**
+ * {@preview Associated with pattern matching for instanceof, a preview feature of
+ * the Java language.
+ *
+ * This enum constant is associated with pattern matching for instanceof, a preview
+ * feature of the Java language. Preview features
+ * may be removed in a future release, or upgraded to permanent
+ * features of the Java language.}
+ *
+ * Used for instances of {@link DeconstructionPatternTree}.
+ *
+ * @since 15
+ */
+ DECONSTRUCTION_PATTERN(DeconstructionPatternTree.class),
+
+ /**
* Used for instances of {@link PrimitiveTypeTree}.
*/
PRIMITIVE_TYPE(PrimitiveTypeTree.class),
diff -r 66c7a7990f69 -r e04704954553 src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java Thu Mar 12 14:14:29 2020 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java Mon Mar 16 17:08:05 2020 +0100
@@ -275,6 +275,23 @@
R visitBindingPattern(BindingPatternTree node, P p);
/**
+ * {@preview Associated with pattern matching for instanceof, a preview feature of
+ * the Java language.
+ *
+ * This method is associated with pattern matching for instanceof, a preview
+ * feature of the Java language. Preview features
+ * may be removed in a future release, or upgraded to permanent
+ * features of the Java language.}
+ *
+ * Visits an DeconstructionPatternTree node.
+ * @param node the node being visited
+ * @param p a parameter value
+ * @return a result value
+ * @since 15
+ */
+ R visitDeconstructionPattern(DeconstructionPatternTree node, P p);
+
+ /**
* Visits a MethodTree node.
* @param node the node being visited
* @param p a parameter value
diff -r 66c7a7990f69 -r e04704954553 src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java
--- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java Thu Mar 12 14:14:29 2020 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java Mon Mar 16 17:08:05 2020 +0100
@@ -570,6 +570,19 @@
* @param node {@inheritDoc}
* @param p {@inheritDoc}
* @return the result of {@code defaultAction}
+ * @since 15
+ */
+ @Override
+ public R visitDeconstructionPattern(DeconstructionPatternTree node, P p) {
+ return defaultAction(node, p);
+ }
+
+ /**
+ * {@inheritDoc} This implementation calls {@code defaultAction}.
+ *
+ * @param node {@inheritDoc}
+ * @param p {@inheritDoc}
+ * @return the result of {@code defaultAction}
*/
@Override
public R visitArrayAccess(ArrayAccessTree node, P p) {
diff -r 66c7a7990f69 -r e04704954553 src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java
--- a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java Thu Mar 12 14:14:29 2020 -0700
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java Mon Mar 16 17:08:05 2020 +0100
@@ -694,6 +694,20 @@
* @param node {@inheritDoc}
* @param p {@inheritDoc}
* @return the result of scanning
+ * @since 15
+ */
+ @Override
+ public R visitDeconstructionPattern(DeconstructionPatternTree node, P p) {
+ R r = scan(node.getDeconstructor(), p);
+ return scanAndReduce(node.getNestedPatterns(), p, r);
+ }
+
+ /**
+ * {@inheritDoc} This implementation scans the children in left to right order.
+ *
+ * @param node {@inheritDoc}
+ * @param p {@inheritDoc}
+ * @return the result of scanning
*/
@Override
public R visitArrayAccess(ArrayAccessTree node, P p) {