Add equal and not equal operators to Rust AST

7 files changed, 165 insertions, 1 deletions

diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob
index e0f1061..001972c 100644
--- a/hobgoblin/src/output/lang/rust/ast.hob
+++ b/hobgoblin/src/output/lang/rust/ast.hob
@@ -123,6 +123,7 @@ struct RustLetStatement {
 
 sum RustExpression {
     variant RustArrayRepeatExpression;
+    variant RustBinaryExpression;
     variant RustBlockExpression;
     variant RustBoolLiteral;
     variant RustCallExpression;
@@ -141,6 +142,17 @@ struct RustArrayRepeatExpression {
     field lengthOperand: RustExpression;
 }
 
+struct RustBinaryExpression {
+    field operator: RustBinaryOperator;
+    field left: RustExpression;
+    field right: RustExpression;
+}
+
+enum RustBinaryOperator {
+    variant equal;
+    variant notEqual;
+}
+
 struct RustBlockExpression {
     field statements: List[RustStatement];
     field finalOperand: Option[RustExpression];
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriter.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriter.java
index 8c449f9..3acb799 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriter.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriter.java
@@ -319,6 +319,10 @@ public class RustWriter implements AutoCloseable {
                 this.writeArrayRepeatExpression(arrayRepeatExpression);
             }
 
+            case RustBinaryExpression binaryExpression -> {
+                this.writeBinaryExpression(binaryExpression);
+            }
+
             case RustBlockExpression blockExpression -> {
                 this.writeBlockExpression(blockExpression);
             }
@@ -373,6 +377,17 @@ public class RustWriter implements AutoCloseable {
         this.writer.write("]");
     }
 
+    private void writeBinaryExpression(RustBinaryExpression binaryExpression) throws IOException {
+        this.writeExpression(binaryExpression.left());
+        this.writer.write(" ");
+        this.writer.write(switch (binaryExpression.operator()) {
+            case EQUAL -> "==";
+            case NOT_EQUAL -> "!=";
+        });
+        this.writer.write(" ");
+        this.writeExpression(binaryExpression.right());
+    }
+
     private void writeBlockExpression(RustBlockExpression blockExpression) throws IOException {
         this.writer.write("{");
         this.writer.indent();
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryExpression.java
new file mode 100644
index 0000000..5344f84
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryExpression.java
@@ -0,0 +1,44 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression imports
+
+public record RustBinaryExpression(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator operator, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression left, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression right) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression {
+    public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator.EQUAL, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.arbitrary().build());
+    }
+
+    public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator operator, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression left, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression right) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder {
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression(operator, left, right);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder withOperator(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator operator) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder(operator, left, right);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder withLeft(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression left) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder(operator, left, right);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder withLeft(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder left) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder(operator, left.build(), right);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder withRight(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression right) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder(operator, left, right);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder withRight(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder right) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder(operator, left, right.build());
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression body
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryOperator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryOperator.java
new file mode 100644
index 0000000..5adad69
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryOperator.java
@@ -0,0 +1,14 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator imports
+
+public enum RustBinaryOperator {
+    EQUAL,
+    NOT_EQUAL
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator body
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.java
index 26fd95f..19e1988 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.java
@@ -5,7 +5,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
 // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression imports
 // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression imports
 
-public sealed interface RustExpression permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBoolLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustCallExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFieldExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIfExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPrefixExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStructExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression {
+public sealed interface RustExpression permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBoolLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustCallExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFieldExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIfExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPrefixExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStructExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression {
     public interface Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression build();
 
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriterTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriterTests.java
index 16c774f..fff5923 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriterTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/RustWriterTests.java
@@ -408,6 +408,34 @@ public class RustWriterTests {
         assertThat(string, equalTo("[42; 47]"));
     }
 
+    // === Binary expressions ===
+
+    @Test
+    public void binaryExpressionEqual() throws IOException {
+        var rust = RustBinaryExpression.arbitrary()
+            .withOperator(RustBinaryOperator.EQUAL)
+            .withLeft(RustPath.of("x"))
+            .withRight(RustPath.of("y"))
+            .build();
+
+        var string = write(writer -> writer.writeExpression(rust));
+
+        assertThat(string, equalTo("x == y"));
+    }
+
+    @Test
+    public void binaryExpressionNotEqual() throws IOException {
+        var rust = RustBinaryExpression.arbitrary()
+            .withOperator(RustBinaryOperator.NOT_EQUAL)
+            .withLeft(RustPath.of("x"))
+            .withRight(RustPath.of("y"))
+            .build();
+
+        var string = write(writer -> writer.writeExpression(rust));
+
+        assertThat(string, equalTo("x != y"));
+    }
+
     // === Block expressions ===
 
     @Test
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryExpressionMatcher.java
new file mode 100644
index 0000000..172f969
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBinaryExpressionMatcher.java
@@ -0,0 +1,51 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher imports
+
+public class RustBinaryExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher isRustBinaryExpression() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression>> submatchers;
+
+    private RustBinaryExpressionMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression>> 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.rust.ast.RustBinaryExpression.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher withOperator(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryOperator> operator) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("operator", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression::operator, operator));
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher(submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher withLeft(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> left) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("left", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression::left, left));
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher(submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher withRight(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> right) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("right", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpression::right, right));
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBinaryExpressionMatcher body
+}