Add closure expressions to Rust AST

3 files changed, 73 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 3f3f3d8..d894253 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
@@ -335,6 +335,10 @@ public class RustWriter implements AutoCloseable {
                 this.writeCallExpression(callExpression);
             }
 
+            case RustClosureExpression closureExpression -> {
+                this.writeClosureExpression(closureExpression);
+            }
+
             case RustFieldExpression fieldExpression -> {
                 this.writeFieldExpression(fieldExpression);
             }
@@ -414,6 +418,7 @@ public class RustWriter implements AutoCloseable {
             case RustBlockExpression _ -> RustPrecedence.PRIMARY;
             case RustBoolLiteral _ -> RustPrecedence.PRIMARY;
             case RustCallExpression _ -> RustPrecedence.FUNCTION_CALLS;
+            case RustClosureExpression _ -> RustPrecedence.PRIMARY;
             case RustFieldExpression _ -> RustPrecedence.FIELD_EXPRESSIONS;
             case RustIfExpression _ -> RustPrecedence.PRIMARY;
             case RustIntegerLiteral _ -> RustPrecedence.PRIMARY;
@@ -522,6 +527,25 @@ public class RustWriter implements AutoCloseable {
         this.writer.write(")");
     }
 
+    private void writeClosureExpression(
+        RustClosureExpression closureExpression
+    ) throws IOException {
+        this.writer.write("|");
+
+        writeWithSeparator(
+            closureExpression.params(),
+            this::writePattern,
+            () -> {
+                this.writer.write(", ");
+            }
+        );
+
+        this.writer.write("| ");
+
+        this.writeTopLevelExpression(closureExpression.body());
+    }
+
+
     private void writeFieldExpression(RustFieldExpression fieldExpression) throws IOException {
         this.writeSubExpression(fieldExpression.containerOperand(), precedence(fieldExpression), true);
         this.writer.write(".");
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustClosureExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustClosureExpression.java
new file mode 100644
index 0000000..2322750
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustClosureExpression.java
@@ -0,0 +1,48 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression imports
+
+public record RustClosureExpression(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern> params, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression body) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression {
+    public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder(java.util.List.of(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.arbitrary().build());
+    }
+
+    public record Builder(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern> params, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression body) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder {
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression(params, body);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder withParams(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern> params) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder(params, body);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern param) {
+            var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern>(this.params);
+            params.add(param);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder(params, body);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern.Builder param) {
+            var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern>(this.params);
+            params.add(param.build());
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder(params, body);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder withBody(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression body) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder(params, body);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder withBody(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder body) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder(params, body.build());
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustClosureExpression 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 8e55bc4..5f51d5e 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.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.RustIteratorLoopExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMatchExpression, 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.RustRangeExpr, 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, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustVecRepeatExpression {
+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.RustClosureExpression, 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.RustIteratorLoopExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMatchExpression, 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.RustRangeExpr, 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, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustVecRepeatExpression {
     public interface Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression build();