Add tuple expression to Rust AST

5 files changed, 138 insertions, 1 deletions

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 ea3a38b..06c35c6 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
@@ -358,6 +358,10 @@ public class RustWriter implements AutoCloseable {
             case RustTryPropagationExpression tryPropagationExpression -> {
                 this.writeTryPropagationExpression(tryPropagationExpression);
             }
+
+            case RustTupleExpression tupleExpression -> {
+                this.writeTupleExpression(tupleExpression);
+            }
         }
     }
 
@@ -462,6 +466,25 @@ public class RustWriter implements AutoCloseable {
         this.writer.write("?");
     }
 
+    private void writeTupleExpression(
+        RustTupleExpression tupleExpression
+    ) throws IOException {
+        this.writer.write("(");
+        if (tupleExpression.elements().size() == 1) {
+            this.writeExpression(tupleExpression.elements().getFirst());
+            this.writer.write(",");
+        } else if (tupleExpression.elements().size() > 1) {
+            writeWithSeparator(
+                tupleExpression.elements(),
+                this::writeExpression,
+                () -> {
+                    this.writer.write(", ");
+                }
+            );
+        }
+        this.writer.write(")");
+    }
+
     // == Types ==
 
     void writeType(RustType type) throws IOException {
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 bd6d86b..26fd95f 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 {
+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 interface Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression build();
 
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpression.java
new file mode 100644
index 0000000..d8f79c8
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpression.java
@@ -0,0 +1,40 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression imports
+
+public record RustTupleExpression(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> elements) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression {
+    public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(java.util.List.of());
+    }
+
+    public record Builder(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> elements) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder {
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression(elements);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder withElements(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> elements) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(elements);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder addElement(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression element) {
+            var elements = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression>(this.elements);
+            elements.add(element);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(elements);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder addElement(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder element) {
+            var elements = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression>(this.elements);
+            elements.add(element.build());
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(elements);
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression body
+}
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 ea6334f..eebc834 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
@@ -641,6 +641,41 @@ public class RustWriterTests {
         assertThat(string, equalTo("a?"));
     }
 
+    // === Tuple expressions ===
+
+    @Test
+    public void tupleExpressionUnit() throws IOException {
+        var rust = RustTupleExpression.arbitrary().build();
+
+        var string = write(writer -> writer.writeExpression(rust));
+
+        assertThat(string, equalTo("()"));
+    }
+
+    @Test
+    public void tupleExpressionSingleton() throws IOException {
+        var rust = RustTupleExpression.arbitrary()
+            .addElement(RustPath.of("a"))
+            .build();
+
+        var string = write(writer -> writer.writeExpression(rust));
+
+        assertThat(string, equalTo("(a,)"));
+    }
+
+    @Test
+    public void tupleExpressionManyElements() throws IOException {
+        var rust = RustTupleExpression.arbitrary()
+            .addElement(RustPath.of("a"))
+            .addElement(RustPath.of("b"))
+            .addElement(RustPath.of("c"))
+            .build();
+
+        var string = write(writer -> writer.writeExpression(rust));
+
+        assertThat(string, equalTo("(a, b, c)"));
+    }
+
     // == Types ==
 
     @Test
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpressionMatcher.java
new file mode 100644
index 0000000..450ae91
--- /dev/null
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpressionMatcher.java
@@ -0,0 +1,39 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher imports
+
+public class RustTupleExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> {
+    public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher isRustTupleExpression() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher(java.util.List.of());
+    }
+
+    private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression>> submatchers;
+
+    private RustTupleExpressionMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression>> 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.RustTupleExpression.class, this.submatchers);
+    }
+
+    public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher withElements(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression>> elements) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("elements", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression::elements, elements));
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher(submatchers);
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher body
+}