Support multiple "case" labels

javaparser · Jan 25, 2019 · 1082101 · 1082101
1 parent 717b7c9
commit 1082101
Show file tree

Hide file tree

Showing 22 changed files with 90 additions and 91 deletions.
diff --git a/...nerators/src/main/java/com/github/javaparser/generator/core/other/TokenKindGenerator.java b/...nerators/src/main/java/com/github/javaparser/generator/core/other/TokenKindGenerator.java
@@ -38,7 +38,7 @@ public void generate() {
         annotateGenerated(kindEnum);
 
         final SwitchStmt valueOfSwitch = kindEnum.findFirst(SwitchStmt.class).orElseThrow(() -> new AssertionError("Can't find valueOf switch."));
-        valueOfSwitch.findAll(SwitchEntry.class).stream().filter(e -> e.getLabel().isPresent()).forEach(Node::remove);
+        valueOfSwitch.findAll(SwitchEntry.class).stream().filter(e -> e.getLabels().isNonEmpty()).forEach(Node::remove);
 
         final CompilationUnit constantsCu = generatedJavaCcSourceRoot.parse("com.github.javaparser", "GeneratedJavaParserConstants.java");
         final ClassOrInterfaceDeclaration constants = constantsCu.getInterfaceByName("GeneratedJavaParserConstants").orElseThrow(() -> new AssertionError("Can't find class in java file."));
@@ -59,7 +59,7 @@ public void generate() {
     }
 
     private void generateValueOfEntry(SwitchStmt valueOfSwitch, String name, IntegerLiteralExpr kind) {
-        final SwitchEntry entry = new SwitchEntry(kind, SwitchEntry.Type.STATEMENT_GROUP, new NodeList<>(new ReturnStmt(name)));
+        final SwitchEntry entry = new SwitchEntry(new NodeList<>(kind), SwitchEntry.Type.STATEMENT_GROUP, new NodeList<>(new ReturnStmt(name)));
         valueOfSwitch.getEntries().addFirst(entry);
     }
 

diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SwitchExprTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SwitchExprTest.java
@@ -11,9 +11,9 @@ class SwitchExprTest {
     @Test
     void jep325Example2() {
         parseStatement("int numLetters = switch (day) {\n" +
-//                "    case MONDAY, FRIDAY, SUNDAY -> 6;\n" +
+                "    case MONDAY, FRIDAY, SUNDAY -> 6;\n" +
                 "    case TUESDAY                -> 7;\n" +
-//                "    case THURSDAY, SATURDAY     -> 8;\n" +
+                "    case THURSDAY, SATURDAY     -> 8;\n" +
                 "    case WEDNESDAY              -> 9;\n" +
                 "};");
     }

diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/SwitchStmtTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/SwitchStmtTest.java
@@ -1,5 +1,6 @@
 package com.github.javaparser.ast.stmt;
 
+import com.github.javaparser.ast.NodeList;
 import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
@@ -21,7 +22,7 @@ void classicSwitch() {
         assertEquals(STATEMENT_GROUP, switchStmt.getEntry(0).getType());
         assertEquals(STATEMENT_GROUP, switchStmt.getEntry(1).getType());
         assertEquals(STATEMENT_GROUP, switchStmt.getEntry(2).getType());
-        assertEquals(Optional.empty(), switchStmt.getEntry(2).getLabel());
+        assertEquals(new NodeList<>(), switchStmt.getEntry(2).getLabels());
     }
     @Test
     void jep325Example1() {

diff --git a/...er-core-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java b/...er-core-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java
@@ -19,7 +19,7 @@ class Java6ValidatorTest {
     @Test
     void noStringsInSwitch() {
         ParseResult<Statement> result = javaParser.parse(STATEMENT, provider("switch(x){case \"abc\": ;}"));
-        assertProblems(result, "(line 1,col 16) Strings in switch statements are not supported.");
+        assertProblems(result, "(line 1,col 11) Strings in switch statements are not supported.");
     }
 
     @Test

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java
@@ -74,6 +74,7 @@ public enum ObservableProperty {
     ITERABLE(Type.SINGLE_REFERENCE),
     KEYWORD(Type.SINGLE_ATTRIBUTE),
     LABEL(Type.SINGLE_REFERENCE),
+    LABELS(Type.MULTIPLE_REFERENCE),
     LEFT(Type.SINGLE_REFERENCE),
     LEVELS(Type.MULTIPLE_REFERENCE),
     MEMBERS(Type.MULTIPLE_REFERENCE),

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java
@@ -32,11 +32,7 @@
 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.OptionalProperty;
 import com.github.javaparser.metamodel.SwitchEntryMetaModel;
-
-import java.util.Optional;
-
 import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
@@ -80,29 +76,28 @@ public enum Type {
         STATEMENT_GROUP, EXPRESSION, BLOCK, THROWS_STATEMENT
     }
 
-    @OptionalProperty
+    private NodeList<Expression> labels;
-    private Expression label;
 
     private NodeList<Statement> statements;
 
     private Type type;
 
     public SwitchEntry() {
-        this(null, null, new NodeList<>());
+        this(null, new NodeList<Expression>(), Type.STATEMENT_GROUP, new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public SwitchEntry(final Expression label, final Type type, final NodeList<Statement> statements) {
+    public SwitchEntry(final NodeList<Expression> labels, final Type type, final NodeList<Statement> statements) {
-        this(null, label, type, statements);
+        this(null, labels, type, statements);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public SwitchEntry(TokenRange tokenRange, Expression label, Type type, NodeList<Statement> statements) {
+    public SwitchEntry(TokenRange tokenRange, NodeList<Expression> labels, Type type, NodeList<Statement> statements) {
         super(tokenRange);
-        setLabel(label);
+        setLabels(labels);
         setType(type);
         setStatements(statements);
         customInitialization();
@@ -121,8 +116,8 @@ public <A> void accept(final VoidVisitor<A> v, final A arg) {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public Optional<Expression> getLabel() {
+    public NodeList<Expression> getLabels() {
-        return Optional.ofNullable(label);
+        return labels;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
@@ -133,19 +128,20 @@ public NodeList<Statement> getStatements() {
     /**
      * Sets the label
      *
-     * @param label the label, can be null
+     * @param labels the label, can be null
      * @return this, the SwitchEntry
      */
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public SwitchEntry setLabel(final Expression label) {
+    public SwitchEntry setLabels(final NodeList<Expression> labels) {
-        if (label == this.label) {
+        assertNotNull(labels);
+        if (labels == this.labels) {
             return (SwitchEntry) this;
         }
-        notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
+        notifyPropertyChange(ObservableProperty.LABELS, this.labels, labels);
-        if (this.label != null)
+        if (this.labels != null)
-            this.label.setParentNode(null);
+            this.labels.setParentNode(null);
-        this.label = label;
+        this.labels = labels;
-        setAsParentNodeOf(label);
+        setAsParentNodeOf(labels);
         return this;
     }
 
@@ -168,9 +164,9 @@ public SwitchEntry setStatements(final NodeList<Statement> statements) {
     public boolean remove(Node node) {
         if (node == null)
             return false;
-        if (label != null) {
+        for (int i = 0; i < labels.size(); i++) {
-            if (node == label) {
+            if (labels.get(i) == node) {
-                removeLabel();
+                labels.remove(i);
                 return true;
             }
         }
@@ -183,11 +179,6 @@ public boolean remove(Node node) {
         return super.remove(node);
     }
 
-    @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator")
-    public SwitchEntry removeLabel() {
-        return setLabel((Expression) null);
-    }
-
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
     public SwitchEntry clone() {
@@ -200,26 +191,6 @@ public SwitchEntryMetaModel getMetaModel() {
         return JavaParserMetaModel.switchEntryMetaModel;
     }
 
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator")
-    public boolean replace(Node node, Node replacementNode) {
-        if (node == null)
-            return false;
-        if (label != null) {
-            if (node == label) {
-                setLabel((Expression) replacementNode);
-                return true;
-            }
-        }
-        for (int i = 0; i < statements.size(); i++) {
-            if (statements.get(i) == node) {
-                statements.set(i, (Statement) replacementNode);
-                return true;
-            }
-        }
-        return super.replace(node, replacementNode);
-    }
-
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
     public Type getType() {
         return type;
@@ -235,4 +206,23 @@ public SwitchEntry setType(final Type type) {
         this.type = type;
         return this;
     }
+
+    @Override
+    public boolean replace(Node node, Node replacementNode) {
+        if (node == null)
+            return false;
+        for (int i = 0; i < labels.size(); i++) {
+            if (labels.get(i) == node) {
+                labels.set(i, (Expression) replacementNode);
+                return true;
+            }
+        }
+        for (int i = 0; i < statements.size(); i++) {
+            if (statements.get(i) == node) {
+                statements.set(i, (Statement) replacementNode);
+                return true;
+            }
+        }
+        return super.replace(node, replacementNode);
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java1_0Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/Java1_0Validator.java
@@ -80,8 +80,8 @@ public class Java1_0Validator extends Validators {
             (n, reporter) -> reporter.report(n, "Static imports are not supported.")
     );
     protected final Validator noStringsInSwitch = new SimpleValidator<>(SwitchEntry.class,
-            n -> n.getLabel().map(l -> l instanceof StringLiteralExpr).orElse(false),
+            n -> n.getLabels().stream().anyMatch(l -> l instanceof StringLiteralExpr),
-            (n, reporter) -> reporter.report(n.getLabel().get(), "Strings in switch statements are not supported.")
+            (n, reporter) -> reporter.report(n.getLabels().getParentNode().get(), "Strings in switch statements are not supported.")
     );
     protected final Validator noBinaryIntegerLiterals = new NoBinaryIntegerLiteralsValidator();
     protected final Validator noUnderscoresInIntegerLiterals = new NoUnderscoresInIntegerLiteralsValidator();

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
@@ -702,10 +702,10 @@ public Visitable visit(final SwitchStmt n, final Object arg) {
 
     @Override
     public Visitable visit(final SwitchEntry n, final Object arg) {
-        Expression label = cloneNode(n.getLabel(), arg);
+        NodeList<Expression> labels = cloneList(n.getLabels(), arg);
         NodeList<Statement> statements = cloneList(n.getStatements(), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        SwitchEntry r = new SwitchEntry(n.getTokenRange().orElse(null), label, n.getType(), statements);
+        SwitchEntry r = new SwitchEntry(n.getTokenRange().orElse(null), labels, n.getType(), statements);
         r.setComment(comment);
         return r;
     }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
@@ -974,7 +974,7 @@ public Boolean visit(final SwitchStmt n, final Visitable arg) {
     @Override
     public Boolean visit(final SwitchEntry n, final Visitable arg) {
         final SwitchEntry n2 = (SwitchEntry) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+        if (!nodesEquals(n.getLabels(), n2.getLabels()))
             return false;
         if (!nodesEquals(n.getStatements(), n2.getStatements()))
             return false;

diff --git a/...arser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java b/...arser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java
@@ -1487,8 +1487,8 @@ public List<R> visit(final SuperExpr n, final A arg) {
     public List<R> visit(final SwitchEntry n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
-        if (n.getLabel().isPresent()) {
+        {
-            tmp = n.getLabel().get().accept(this, arg);
+            tmp = n.getLabels().accept(this, arg);
             if (tmp != null)
                 result.addAll(tmp);
         }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
@@ -1408,8 +1408,8 @@ public R visit(final SuperExpr n, final A arg) {
     @Override
     public R visit(final SwitchEntry n, final A arg) {
         R result;
-        if (n.getLabel().isPresent()) {
+        {
-            result = n.getLabel().get().accept(this, arg);
+            result = n.getLabels().accept(this, arg);
             if (result != null)
                 return result;
         }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java
@@ -319,7 +319,7 @@ public Integer visit(final SuperExpr n, final Void arg) {
     }
 
     public Integer visit(final SwitchEntry n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getLabels().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SwitchStmt n, final Void arg) {

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java
@@ -837,10 +837,10 @@ public Visitable visit(final SuperExpr n, final A arg) {
 
     @Override
     public Visitable visit(final SwitchEntry n, final A arg) {
-        Expression label = n.getLabel().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        NodeList<Expression> labels = modifyList(n.getLabels(), arg);
         NodeList<Statement> statements = modifyList(n.getStatements(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        n.setLabel(label);
+        n.setLabels(labels);
         n.setStatements(statements);
         n.setComment(comment);
         return n;

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java
@@ -792,7 +792,7 @@ public Boolean visit(final SwitchStmt n, final Visitable arg) {
     @Override
     public Boolean visit(final SwitchEntry n, final Visitable arg) {
         final SwitchEntry n2 = (SwitchEntry) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+        if (!nodesEquals(n.getLabels(), n2.getLabels()))
             return false;
         if (!nodesEquals(n.getStatements(), n2.getStatements()))
             return false;

diff --git a/...parser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java b/...parser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java
@@ -311,7 +311,7 @@ public Integer visit(final SuperExpr n, final Void arg) {
     }
 
     public Integer visit(final SwitchEntry n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode());
+        return (n.getLabels().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode());
     }
 
     public Integer visit(final SwitchStmt n, final Void arg) {

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
@@ -494,7 +494,7 @@ public void visit(final SuperExpr n, final A arg) {
 
     @Override
     public void visit(final SwitchEntry n, final A arg) {
-        n.getLabel().ifPresent(l -> l.accept(this, arg));
+        n.getLabels().forEach(p -> p.accept(this, arg));
         n.getStatements().forEach(p -> p.accept(this, arg));
         n.getComment().ifPresent(l -> l.accept(this, arg));
     }

diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java
@@ -202,7 +202,7 @@ private static void initializeConstructorParameters() {
         labeledStmtMetaModel.getConstructorParameters().add(labeledStmtMetaModel.labelPropertyMetaModel);
         labeledStmtMetaModel.getConstructorParameters().add(labeledStmtMetaModel.statementPropertyMetaModel);
         returnStmtMetaModel.getConstructorParameters().add(returnStmtMetaModel.expressionPropertyMetaModel);
-        switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.labelPropertyMetaModel);
+        switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.labelsPropertyMetaModel);
         switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.typePropertyMetaModel);
         switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.statementsPropertyMetaModel);
         switchStmtMetaModel.getConstructorParameters().add(switchStmtMetaModel.selectorPropertyMetaModel);
@@ -683,8 +683,8 @@ private static void initializePropertyMetaModels() {
         labeledStmtMetaModel.getDeclaredPropertyMetaModels().add(labeledStmtMetaModel.statementPropertyMetaModel);
         returnStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(returnStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         returnStmtMetaModel.getDeclaredPropertyMetaModels().add(returnStmtMetaModel.expressionPropertyMetaModel);
-        switchEntryMetaModel.labelPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "label", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
+        switchEntryMetaModel.labelsPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "labels", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
-        switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.labelPropertyMetaModel);
+        switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.labelsPropertyMetaModel);
         switchEntryMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "statements", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, true, false);
         switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.statementsPropertyMetaModel);
         switchEntryMetaModel.typePropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "type", com.github.javaparser.ast.stmt.SwitchEntry.Type.class, Optional.empty(), false, false, false, false);

diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java
@@ -8,7 +8,7 @@ public class SwitchEntryMetaModel extends NodeMetaModel {
         super(superBaseNodeMetaModel, com.github.javaparser.ast.stmt.SwitchEntry.class, "SwitchEntry", "com.github.javaparser.ast.stmt", false, false);
     }
 
-    public PropertyMetaModel labelPropertyMetaModel;
+    public PropertyMetaModel labelsPropertyMetaModel;
 
     public PropertyMetaModel statementsPropertyMetaModel;
 

diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java b/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java
@@ -674,8 +674,8 @@ private static CsmElement typeArguments() {
 
         concreteSyntaxModelByClass.put(SwitchEntry.class, sequence(
                 comment(),
-                conditional(ObservableProperty.LABEL, IS_PRESENT,
+                conditional(ObservableProperty.LABELS, IS_NOT_EMPTY,
-                        sequence(token(GeneratedJavaParserConstants.CASE), space(), child(ObservableProperty.LABEL), token(GeneratedJavaParserConstants.COLON)),
+                        sequence(token(GeneratedJavaParserConstants.CASE), space(), list(ObservableProperty.LABELS), token(GeneratedJavaParserConstants.COLON)),
                         sequence(token(GeneratedJavaParserConstants._DEFAULT), token(GeneratedJavaParserConstants.COLON))),
                 newline(),
                 indent(),