Add instanceof operator to Java AST

5 files changed, 122 insertions, 1 deletions

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 e13290f..4e4d8e5 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
@@ -620,6 +620,10 @@ public class JavaWriter implements AutoCloseable {
                 writeFieldAccess(fieldAccess);
             }
 
+            case JavaInstanceofExpression instanceofExpression -> {
+                writeInstanceofExpression(instanceofExpression);
+            }
+
             case JavaIntegerLiteral integerLiteral -> {
                 writeIntegerLiteral(integerLiteral);
             }
@@ -695,6 +699,7 @@ public class JavaWriter implements AutoCloseable {
             case JavaBooleanLiteral booleanLiteral -> JavaPrecedence.PRIMARY;
             case JavaCast cast -> JavaPrecedence.PRIMARY;
             case JavaFieldAccess fieldAccess -> JavaPrecedence.PRIMARY;
+            case JavaInstanceofExpression instanceofExpression -> JavaPrecedence.RELATIONAL;
             case JavaIntegerLiteral integerLiteral -> JavaPrecedence.PRIMARY;
             case JavaMethodCall methodCall -> JavaPrecedence.PRIMARY;
             case JavaMethodRef methodRef -> JavaPrecedence.PRIMARY;
@@ -799,6 +804,12 @@ public class JavaWriter implements AutoCloseable {
         this.writeIdentifier(fieldAccess.fieldName());
     }
 
+    private void writeInstanceofExpression(JavaInstanceofExpression instanceofExpression) throws IOException {
+        this.writeSubExpression(instanceofExpression.value(), precedence(instanceofExpression), true);
+        this.writer.write(" instanceof ");
+        this.writePattern(instanceofExpression.pattern());
+    }
+
     private void writeIntegerLiteral(JavaIntegerLiteral integerLiteral) throws IOException {
         this.writer.write(Long.toString(integerLiteral.value()));
     }
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 5d992af..233b136 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.JavaFieldAccess, 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.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 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/JavaInstanceofExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInstanceofExpression.java
new file mode 100644
index 0000000..42f227f
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInstanceofExpression.java
@@ -0,0 +1,46 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression imports
+
+public record JavaInstanceofExpression(
+    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression value,
+    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern pattern
+) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.arbitrary().build());
+    }
+
+    public record Builder(
+        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression value,
+        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern pattern
+    ) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder {
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression(value, pattern);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder withValue(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression value) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder(value, pattern);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder withValue(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder value) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder(value.build(), pattern);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder withPattern(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern pattern) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder(value, pattern);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder withPattern(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder pattern) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder(value, pattern.build());
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression 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 4ce2ea1..8b60341 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
@@ -1456,6 +1456,23 @@ public class JavaWriterTests {
         assertThat(string, equalTo("one.two"));
     }
 
+    // === Instanceof expressions ===
+
+    @Test
+    public void instanceofExpression() throws IOException {
+        var java = JavaInstanceofExpression.arbitrary()
+            .withValue(JavaRef.arbitrary().withName(JavaIdentifier.of("a")))
+            .withPattern(JavaPattern.arbitrary()
+                .withType(JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("B")))
+                .withVariableName(JavaIdentifier.of("b"))
+            )
+            .build();
+
+        var string = write(writer -> writer.writeTopLevelExpression(java));
+
+        assertThat(string, equalTo("a instanceof B b"));
+    }
+
     // === Integer literals ===
 
     @Test
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInstanceofExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInstanceofExpressionMatcher.java
new file mode 100644
index 0000000..959ebb2
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInstanceofExpressionMatcher.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.JavaInstanceofExpressionMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher imports
+
+public class JavaInstanceofExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher isJavaInstanceofExpression() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression>> submatchers;
+
+    private JavaInstanceofExpressionMatcher(
+        java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression>> 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.JavaInstanceofExpression.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher withValue(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> value) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("value", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression::value, value));
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher(submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher withPattern(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern> pattern) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("pattern", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression::pattern, pattern));
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpressionMatcher body
+}