Add switch expression to Java AST

9 files changed, 270 insertions, 4 deletions

diff --git a/hobgoblin/src/output/lang/java/ast.hob b/hobgoblin/src/output/lang/java/ast.hob
index b1352cc..69b4382 100644
--- a/hobgoblin/src/output/lang/java/ast.hob
+++ b/hobgoblin/src/output/lang/java/ast.hob
@@ -137,6 +137,7 @@ sum JavaBlockStatement {
     variant JavaReturn;
     variant JavaSwitchStatement;
     variant JavaThrowStatement;
+    variant JavaYieldStatement;
 }
 
 struct JavaBasicForStatement {
@@ -204,6 +205,10 @@ struct JavaThrowStatement {
     field expression: JavaExpression;
 }
 
+struct JavaYieldStatement {
+    field expression: JavaExpression;
+}
+
 // == Patterns ==
 
 struct JavaPattern {
@@ -231,6 +236,7 @@ sum JavaExpression {
     variant JavaStaticFieldAccess;
     variant JavaStaticMethodCall;
     variant JavaStringLiteral;
+    variant JavaSwitchExpression;
     variant JavaTernaryConditional;
 }
 
@@ -335,6 +341,11 @@ struct JavaStringLiteral {
     field value: String;
 }
 
+struct JavaSwitchExpression {
+    field selectorExpression: JavaExpression;
+    field rules: List[JavaSwitchRule];
+}
+
 struct JavaTernaryConditional {
     field condition: JavaExpression;
     field ifTrue: JavaExpression;
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java
index 54b4c12..60998aa 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java
@@ -472,6 +472,10 @@ public class JavaWriter implements AutoCloseable {
             case JavaThrowStatement throwStatement -> {
                 writeThrowStatement(throwStatement);
             }
+
+            case JavaYieldStatement yieldStatement -> {
+                writeYieldStatement(yieldStatement);
+            }
         }
     }
 
@@ -559,11 +563,18 @@ public class JavaWriter implements AutoCloseable {
     }
 
     private void writeSwitchStatement(JavaSwitchStatement switchStatement) throws IOException {
+        writeSwitch(switchStatement.selectorExpression(), switchStatement.rules());
+    }
+
+    private void writeSwitch(
+        JavaExpression selectorExpression,
+        List<JavaSwitchRule> rules
+    ) throws IOException {
         this.writer.write("switch (");
-        this.writeTopLevelExpression(switchStatement.selectorExpression());
+        this.writeTopLevelExpression(selectorExpression);
         this.writer.write(") {");
         this.writer.indent();
-        for (var rule : switchStatement.rules()) {
+        for (var rule : rules) {
             this.writer.newLine();
             switch (rule.label()) {
                 case JavaCaseConstant caseConstant -> {
@@ -594,6 +605,12 @@ public class JavaWriter implements AutoCloseable {
         this.writer.write(";");
     }
 
+    private void writeYieldStatement(JavaYieldStatement yieldStatement) throws IOException {
+        this.writer.write("yield ");
+        this.writeTopLevelExpression(yieldStatement.expression());
+        this.writer.write(";");
+    }
+
     // == Patterns ==
 
     private void writePattern(JavaPattern pattern) throws IOException {
@@ -674,6 +691,10 @@ public class JavaWriter implements AutoCloseable {
                 writeStringLiteral(stringLiteral);
             }
 
+            case JavaSwitchExpression switchExpression -> {
+                writeSwitchExpression(switchExpression);
+            }
+
             case JavaTernaryConditional ternaryConditional -> {
                 writeTernaryConditional(ternaryConditional);
             }
@@ -721,6 +742,7 @@ public class JavaWriter implements AutoCloseable {
             case JavaStaticFieldAccess staticFieldAccess -> JavaPrecedence.PRIMARY;
             case JavaStaticMethodCall staticMethodCall -> JavaPrecedence.PRIMARY;
             case JavaStringLiteral stringLiteral -> JavaPrecedence.PRIMARY;
+            case JavaSwitchExpression _ -> JavaPrecedence.PRIMARY;
             case JavaTernaryConditional _ -> JavaPrecedence.TERNARY;
         };
     }
@@ -925,6 +947,13 @@ public class JavaWriter implements AutoCloseable {
         this.writeSubExpression(ternaryConditional.ifFalse(), JavaPrecedence.TERNARY, true);
     }
 
+    private void writeSwitchExpression(JavaSwitchExpression switchExpression) throws IOException {
+        this.writeSwitch(
+            switchExpression.selectorExpression(),
+            switchExpression.rules()
+        );
+    }
+
     // == Identifiers ==
 
     private void writeIdentifier(JavaIdentifier identifier) throws IOException {
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaBlockStatement.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaBlockStatement.java
index a04796a..cc4ba18 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaBlockStatement.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaBlockStatement.java
@@ -5,7 +5,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
 // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlockStatement imports
 // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlockStatement imports
 
-public sealed interface JavaBlockStatement permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBasicForStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlock, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaEnhancedForStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpressionStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIfStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaLocalVariableDeclaration, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaReturn, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaThrowStatement {
+public sealed interface JavaBlockStatement permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBasicForStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlock, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaEnhancedForStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpressionStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIfStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaLocalVariableDeclaration, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaReturn, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaThrowStatement, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement {
     public interface Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlockStatement build();
 
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java
index 0cd2893..dd6257b 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java
@@ -5,7 +5,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
 // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression imports
 // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression imports
 
-public sealed interface JavaExpression permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBinaryOperation, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNewExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNullLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStringLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional {
+public sealed interface JavaExpression permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBinaryOperation, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNewExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNullLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStringLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional {
     public interface Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression build();
 
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchExpression.java
new file mode 100644
index 0000000..b671a23
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchExpression.java
@@ -0,0 +1,54 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression imports
+
+public record JavaSwitchExpression(
+    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression selectorExpression,
+    java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule> rules
+) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build(), java.util.List.of());
+    }
+
+    public record Builder(
+        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression selectorExpression,
+        java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule> rules
+    ) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder {
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression(selectorExpression, rules);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder withSelectorExpression(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression selectorExpression) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder(selectorExpression, rules);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder withSelectorExpression(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder selectorExpression) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder(selectorExpression.build(), rules);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder withRules(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule> rules) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder(selectorExpression, rules);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder addRule(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule rule) {
+            var rules = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule>(this.rules);
+            rules.add(rule);
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder(selectorExpression, rules);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder addRule(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule.Builder rule) {
+            var rules = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule>(this.rules);
+            rules.add(rule.build());
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder(selectorExpression, rules);
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression body
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaYieldStatement.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaYieldStatement.java
new file mode 100644
index 0000000..298c110
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaYieldStatement.java
@@ -0,0 +1,36 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement imports
+
+public record JavaYieldStatement(
+    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression expression
+) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlockStatement {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build());
+    }
+
+    public record Builder(
+        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression expression
+    ) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlockStatement.Builder {
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement(expression);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder withExpression(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression expression) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder(expression);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder withExpression(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder expression) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder(expression.build());
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement body
+}
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java
index 50f581e..269b490 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java
@@ -1265,6 +1265,17 @@ public class JavaWriterTests {
         assertThat(string, equalTo("throw exception;"));
     }
 
+    // === Yield statements ===
+
+    @Test
+    public void yieldStatement() throws IOException {
+        var java = new JavaYieldStatement(new JavaIntegerLiteral(42));
+
+        var string = write(writer -> writer.writeBlockStatement(java));
+
+        assertThat(string, equalTo("yield 42;"));
+    }
+
     // == Expressions ==
 
     // === Array accesses ===
@@ -1615,6 +1626,43 @@ public class JavaWriterTests {
         assertThat(string, equalTo("one.Two.three"));
     }
 
+    // === Switch expressions ===
+
+    @Test
+    public void switchExpression() throws IOException {
+        // We assume that the various switch rules are tested by the tests for
+        // switch statements.
+        var java = new JavaSwitchExpression(
+            new JavaRef(JavaIdentifier.of("x")),
+            List.of(
+                new JavaSwitchRule(
+                    new JavaCaseConstant(new JavaIntegerLiteral(0)),
+                    new JavaBlock(List.of(
+                        new JavaYieldStatement(new JavaIntegerLiteral(10))
+                    ))
+                ),
+                new JavaSwitchRule(
+                    new JavaCaseConstant(new JavaIntegerLiteral(1)),
+                    new JavaBlock(List.of(
+                        new JavaYieldStatement(new JavaIntegerLiteral(11))
+                    ))
+                )
+            )
+        );
+
+        var string = write(writer -> writer.writeTopLevelExpression(java));
+
+        assertThat(string, equalTo("""
+            switch (x) {
+                case 0 -> {
+                    yield 10;
+                }
+                case 1 -> {
+                    yield 11;
+                }
+            }"""));
+    }
+
     // === Ternary conditionals ===
 
     @Test
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchExpressionMatcher.java
new file mode 100644
index 0000000..cc022df
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchExpressionMatcher.java
@@ -0,0 +1,47 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher imports
+
+public final class JavaSwitchExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher isJavaSwitchExpression() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression>> submatchers;
+
+    private JavaSwitchExpressionMatcher(
+        java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression>> submatchers
+    ) {
+        this.submatchers = submatchers;
+    }
+
+    public org.zwobble.precisely.MatchResult match(java.lang.Object actual) {
+        return this.toMatcher().match(actual);
+    }
+
+    public org.zwobble.precisely.TextTree describe() {
+        return this.toMatcher().describe();
+    }
+
+    private org.zwobble.precisely.Matcher<java.lang.Object> toMatcher() {
+        return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher withSelectorExpression(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> selectorExpression) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("selectorExpression", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression::selectorExpression, selectorExpression));
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher(submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher withRules(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchRule>> rules) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("rules", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpression::rules, rules));
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchExpressionMatcher body
+}
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaYieldStatementMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaYieldStatementMatcher.java
new file mode 100644
index 0000000..21afad7
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaYieldStatementMatcher.java
@@ -0,0 +1,41 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher imports
+
+public final class JavaYieldStatementMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher isJavaYieldStatement() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement>> submatchers;
+
+    private JavaYieldStatementMatcher(
+        java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement>> submatchers
+    ) {
+        this.submatchers = submatchers;
+    }
+
+    public org.zwobble.precisely.MatchResult match(java.lang.Object actual) {
+        return this.toMatcher().match(actual);
+    }
+
+    public org.zwobble.precisely.TextTree describe() {
+        return this.toMatcher().describe();
+    }
+
+    private org.zwobble.precisely.Matcher<java.lang.Object> toMatcher() {
+        return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher withExpression(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> expression) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("expression", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatement::expression, expression));
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaYieldStatementMatcher body
+}