Create break with value

javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SwitchExprTest.java

@@ -63,7 +63,6 @@ void jep325Example5() {
                 "};");
     }
 
-    @Disabled("to be implemented")
     @Test
     void jep325Example6() {
         JavaParser.parseStatement("int result = switch (s) {\n" +

javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/BreakStmtTest.java

@@ -0,0 +1,29 @@
+package com.github.javaparser.ast.stmt;
+
+import com.github.javaparser.ast.expr.BinaryExpr;
+import org.junit.jupiter.api.Test;
+
+import static com.github.javaparser.JavaParser.parseStatement;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+class BreakStmtTest {
+    @Test
+    void simpleBreak() {
+        BreakStmt statement = parseStatement("break;").asBreakStmt();
+        assertFalse(statement.getValue().isPresent());
+    }
+
+    @Test
+    void breakWithLabel() {
+        BreakStmt statement = parseStatement("break hond;").asBreakStmt();
+        assertEquals("hond", statement.getValue().get().asNameExpr().getName().asString());
+
+    }
+
+    @Test
+    void breakWithExpression() {
+        BreakStmt statement = parseStatement("break 12*12;").asBreakStmt();
+        assertEquals(BinaryExpr.class, statement.getValue().get().getClass());
+    }
+}

javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java

@@ -27,22 +27,28 @@
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.nodeTypes.SwitchNode;
 import com.github.javaparser.ast.observer.ObservableProperty;
-import com.github.javaparser.ast.stmt.Statement;
 import com.github.javaparser.ast.stmt.SwitchEntryStmt;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.SwitchStmtMetaModel;
+import com.github.javaparser.metamodel.SwitchExprMetaModel;
+
 import java.util.Optional;
 import java.util.function.Consumer;
+
 import static com.github.javaparser.utils.Utils.assertNotNull;
-import com.github.javaparser.metamodel.SwitchExprMetaModel;
 
 /**
- * A switch expression.
- * <br/>In <code>switch(a) { ... }</code> the selector is "a",
- * and the contents of the { ... } are the entries.
+ * <h1>The switch expression</h1>
+ * <h2>Java 1.0-11</h2>
+ * Not available.
+ * <h2>Java 12-</h2>
+ * Like {@link com.github.javaparser.ast.stmt.SwitchStmt},
+ * but can also be used as an expression.
+ * <br/>
+ * <br/><code>int a = switch(x) { case 5,6 -> 20; case 9 -> 30; default -> 40; };</code>
+ * <br/><code>int a = switch(x) { case 5,6: break 20; default: break 5+5; };</code>
  *
  * @author Julio Vilmar Gesser
  * @see SwitchEntryStmt

javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java

@@ -20,52 +20,64 @@
  */
 package com.github.javaparser.ast.stmt;
 
+import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
-import com.github.javaparser.ast.expr.SimpleName;
+import com.github.javaparser.ast.Generated;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.NameExpr;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
+import com.github.javaparser.metamodel.OptionalProperty;
 import java.util.Optional;
+import java.util.function.Consumer;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.metamodel.BreakStmtMetaModel;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.TokenRange;
-import com.github.javaparser.metamodel.OptionalProperty;
-import java.util.function.Consumer;
-import com.github.javaparser.ast.Generated;
 
 /**
- * A usage of the break keyword.
- * <br/>In <code>break abc;</code> the label is abc.
+ * <h1>The break statement</h1>
+ * <h2>Java 1.0-11</h2>
+ * Break has an optional label:
+ * <br/><code>break;</code>
+ * <br/><code>break somewhere;</code>
+ * <br/>The label is in the "value" property as a NameExpr.
+ * <h2>Java 12</h2>
+ * Break can now also have any expression,
+ * to be used in the switch-expression:
+ * <br/><code>break 123+456;</code>
+ * <br/><code>break "more or less";</code>
+ * <br/>The expression will be in the "value" property.
  *
  * @author Julio Vilmar Gesser
+ * @see com.github.javaparser.ast.expr.SwitchExpr
  */
 public final class BreakStmt extends Statement {
 
     @OptionalProperty
-    private SimpleName label;
+    private Expression value;
 
     public BreakStmt() {
-        this(null, new SimpleName());
+        this(null, new NameExpr());
     }
 
     public BreakStmt(final String label) {
-        this(null, new SimpleName(label));
+        this(null, new NameExpr(label));
     }
 
     @AllFieldsConstructor
-    public BreakStmt(final SimpleName label) {
-        this(null, label);
+    public BreakStmt(final Expression value) {
+        this(null, value);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public BreakStmt(TokenRange tokenRange, SimpleName label) {
+    public BreakStmt(TokenRange tokenRange, Expression value) {
         super(tokenRange);
-        setLabel(label);
+        setValue(value);
         customInitialization();
     }
 
@@ -82,26 +94,26 @@ public <A> void accept(final VoidVisitor<A> v, final A arg) {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public Optional<SimpleName> getLabel() {
-        return Optional.ofNullable(label);
+    public Optional<Expression> getValue() {
+        return Optional.ofNullable(value);
     }
 
     /**
      * Sets the label
      *
-     * @param label the label, can be null
+     * @param value the label or the expression, can be null
      * @return this, the BreakStmt
      */
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public BreakStmt setLabel(final SimpleName label) {
-        if (label == this.label) {
+    public BreakStmt setValue(final Expression value) {
+        if (value == this.value) {
             return (BreakStmt) this;
         }
-        notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null)
-            this.label.setParentNode(null);
-        this.label = label;
-        setAsParentNodeOf(label);
+        notifyPropertyChange(ObservableProperty.VALUE, this.value, value);
+        if (this.value != null)
+            this.value.setParentNode(null);
+        this.value = value;
+        setAsParentNodeOf(value);
         return this;
     }
 
@@ -110,18 +122,18 @@ public BreakStmt setLabel(final SimpleName label) {
     public boolean remove(Node node) {
         if (node == null)
             return false;
-        if (label != null) {
-            if (node == label) {
-                removeLabel();
+        if (value != null) {
+            if (node == value) {
+                removeValue();
                 return true;
             }
         }
         return super.remove(node);
     }
 
     @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator")
-    public BreakStmt removeLabel() {
-        return setLabel((SimpleName) null);
+    public BreakStmt removeValue() {
+        return setValue((Expression) null);
     }
 
     @Override
@@ -141,9 +153,9 @@ public BreakStmtMetaModel getMetaModel() {
     public boolean replace(Node node, Node replacementNode) {
         if (node == null)
             return false;
-        if (label != null) {
-            if (node == label) {
-                setLabel((SimpleName) replacementNode);
+        if (value != null) {
+            if (node == value) {
+                setValue((Expression) replacementNode);
                 return true;
             }
         }

javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java

@@ -28,21 +28,47 @@
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
+
 import static com.github.javaparser.utils.Utils.assertNotNull;
+
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.metamodel.SwitchStmtMetaModel;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
 import com.github.javaparser.TokenRange;
+
 import java.util.function.Consumer;
 import java.util.Optional;
+
 import com.github.javaparser.ast.Generated;
 
 /**
- * A switch statement.
+ * <h1>The switch statement</h1>
+ *
+ * <h2>Java 1.0-1.4</h2>
+ * The basic C-like switch statement.
+ * It can switch only on integers.
+ * <br/><code>switch(x) { case 5: case 6: a=100; break; case 9: a=33; break; default: throw new IllegalStateException(); };</code>
  * <br/>In <code>switch(a) { ... }</code> the selector is "a",
  * and the contents of the { ... } are the entries.
  *
+ * <h2>Java 5-6</h2>
+ * Switching can now also be done on enum constants.
+ * 
+ * <h2>Java 7-11</h2>
+ * Switching can now also be done on strings.
+ *
+ * <h2>Java 12-</h2>
+ * In preparation for pattern matching, lots of changes are made:
+ * <ul>
+ * <li>multiple labels per case
+ * <li>a -> syntax that does not fall through.
+ * <li>break can take any expression (usable in the {@link com.github.javaparser.ast.expr.SwitchExpr})
+ * <li>switch can be used as an expression (it becomes a {@link com.github.javaparser.ast.expr.SwitchExpr})
+ * </ul>
+ * <code>switch(x) { case BANANA,PEAR: b=10; break; default: b=5; };</code>
+ * <br/><code>switch(x) { case 5,6 -> println("uhuh"); default -> println("nope"); };</code>
+ *
  * @author Julio Vilmar Gesser
  * @see SwitchEntryStmt
  * @see com.github.javaparser.ast.expr.SwitchExpr

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java

@@ -22,11 +22,15 @@
 
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
-import com.github.javaparser.ast.comments.*;
+import com.github.javaparser.ast.comments.BlockComment;
+import com.github.javaparser.ast.comments.Comment;
+import com.github.javaparser.ast.comments.JavadocComment;
+import com.github.javaparser.ast.comments.LineComment;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.modules.*;
 import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.*;
+
 import java.util.Optional;
 
 /**
@@ -709,9 +713,9 @@ public Visitable visit(final SwitchEntryStmt n, final Object arg) {
 
     @Override
     public Visitable visit(final BreakStmt n, final Object arg) {
-        SimpleName label = cloneNode(n.getLabel(), arg);
+        Expression value = cloneNode(n.getValue(), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        BreakStmt r = new BreakStmt(n.getTokenRange().orElse(null), label);
+        BreakStmt r = new BreakStmt(n.getTokenRange().orElse(null), value);
         r.setComment(comment);
         return r;
     }

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java

@@ -986,7 +986,7 @@ public Boolean visit(final SwitchEntryStmt n, final Visitable arg) {
     @Override
     public Boolean visit(final BreakStmt n, final Visitable arg) {
         final BreakStmt n2 = (BreakStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+        if (!nodeEquals(n.getValue(), n2.getValue()))
             return false;
         if (!nodeEquals(n.getComment(), n2.getComment()))
             return false;

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java

@@ -319,8 +319,8 @@ public List<R> visit(final BooleanLiteralExpr n, final A arg) {
     public List<R> visit(final BreakStmt n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
-        if (n.getLabel().isPresent()) {
-            tmp = n.getLabel().get().accept(this, arg);
+        if (n.getValue().isPresent()) {
+            tmp = n.getValue().get().accept(this, arg);
             if (tmp != null)
                 result.addAll(tmp);
         }

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java

@@ -262,8 +262,8 @@ public R visit(final BooleanLiteralExpr n, final A arg) {
     @Override
     public R visit(final BreakStmt n, final A arg) {
         R result;
-        if (n.getLabel().isPresent()) {
-            result = n.getLabel().get().accept(this, arg);
+        if (n.getValue().isPresent()) {
+            result = n.getValue().get().accept(this, arg);
             if (result != null)
                 return result;
         }

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java

@@ -99,7 +99,7 @@ public Integer visit(final BooleanLiteralExpr n, final Void arg) {
     }
 
     public Integer visit(final BreakStmt n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValue().isPresent() ? n.getValue().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CastExpr n, final Void arg) {

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java

@@ -180,9 +180,9 @@ public Visitable visit(final BooleanLiteralExpr n, final A arg) {
 
     @Override
     public Visitable visit(final BreakStmt n, final A arg) {
-        SimpleName label = n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
+        Expression value = n.getValue().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        n.setLabel(label);
+        n.setValue(value);
         n.setComment(comment);
         return n;
     }

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java

@@ -802,7 +802,7 @@ public Boolean visit(final SwitchEntryStmt n, final Visitable arg) {
     @Override
     public Boolean visit(final BreakStmt n, final Visitable arg) {
         final BreakStmt n2 = (BreakStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+        if (!nodeEquals(n.getValue(), n2.getValue()))
             return false;
         return true;
     }

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java

@@ -91,7 +91,7 @@ public Integer visit(final BooleanLiteralExpr n, final Void arg) {
     }
 
     public Integer visit(final BreakStmt n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0);
+        return (n.getValue().isPresent() ? n.getValue().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CastExpr n, final Void arg) {

javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java

@@ -117,7 +117,7 @@ public void visit(final BooleanLiteralExpr n, final A arg) {
 
     @Override
     public void visit(final BreakStmt n, final A arg) {
-        n.getLabel().ifPresent(l -> l.accept(this, arg));
+        n.getValue().ifPresent(l -> l.accept(this, arg));
         n.getComment().ifPresent(l -> l.accept(this, arg));
     }
 

javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java

@@ -8,5 +8,5 @@ public class BreakStmtMetaModel extends StatementMetaModel {
         super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.BreakStmt.class, "BreakStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 
-    public PropertyMetaModel labelPropertyMetaModel;
+    public PropertyMetaModel valuePropertyMetaModel;
 }