Allow single expressions in switch expression

resources/bytecode/javFiles/Switch.jav

@@ -7,11 +7,11 @@ record Rec(Integer a, Object b) {}
 public class Switch {
     main(o) {
         return switch (o) {
-        case Rec(Integer a, Integer b) -> { yield a + b; }
-        case Rec(Integer a, Float b) -> { yield a + 10; }
-        case Rec(Integer a, Rec(Integer b, Integer c)) -> { yield a + b + c; }
-        case Integer i -> { yield i; }
-        default -> { yield 0; }
+        case Rec(Integer a, Integer b) -> a + b;
+        case Rec(Integer a, Float b) -> a + 10;
+        case Rec(Integer a, Rec(Integer b, Integer c)) -> a + b + c;
+        case Integer i -> i;
+        default -> 0;
         };
     }
 }

src/main/antlr4/de/dhbwstuttgart/parser/antlr/Java17Parser.g4

@@ -725,7 +725,7 @@ guardedPattern
 // Java17
 switchRuleOutcome
     : block
-    | blockStatement*
+    | expression ';'
     ;
 
 classType

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java

@@ -408,12 +408,9 @@ public class StatementGenerator {
         Block block;
         if (Objects.isNull(outcome.block())) {
             List<Statement> stmts = new ArrayList<>();
-            if (outcome.blockStatement().size() == 1) isSingleExpression = true;
-            outcome.blockStatement().stream().forEach((stmt) -> {
-                stmts.addAll(convert(stmt));
-            });
-            block = new Block(stmts, outcome.blockStatement(0).getStart());
-
+            stmts.add(new Yield(convert(outcome.expression()), outcome.expression().start));
+            isSingleExpression = true;
+            block = new Block(stmts, outcome.expression().getStart());
         } else {
             block = convert(outcome.block(), false);
         }

src/main/java/de/dhbwstuttgart/target/tree/expression/TargetYield.java

@@ -1,4 +1,10 @@
 package de.dhbwstuttgart.target.tree.expression;
 
+import de.dhbwstuttgart.target.tree.type.TargetType;
+
 public record TargetYield(TargetExpression expression) implements TargetExpression {
+    @Override
+    public TargetType type() {
+        return expression.type();
+    }
 }