Add body to Rust functions

4 files changed, 59 insertions, 26 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 f2a3c43..5b3c041 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
@@ -128,17 +128,20 @@ public class RustWriter implements AutoCloseable {
             }
         );
 
-        this.writer.write(") ");
+        this.writer.write(")");
 
         if (function.returnType().isPresent()) {
+            this.writer.write(" ");
             this.writer.write("-> ");
             this.writeType(function.returnType().get());
-            this.writer.write(" ");
         }
 
-        this.writer.write("{");
-        this.writer.newLine();
-        this.writer.write("}");
+        if (function.body().isPresent()) {
+            this.writer.write(" ");
+            this.writeBlockExpression(function.body().get());
+        } else {
+            this.writer.write(";");
+        }
     }
 
     private void writeInherentImpl(RustInherentImpl inherentImpl) throws IOException {
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunction.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunction.java
index 311da08..be92d98 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunction.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunction.java
@@ -5,50 +5,62 @@ package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
 // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction imports
 // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction imports
 
-public record RustFunction(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam> params, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType> returnType) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem {
+public record RustFunction(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam> params, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType> returnType, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression> body) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem {
     public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder arbitrary() {
-        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), java.util.List.of(), java.util.Optional.empty());
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), java.util.List.of(), java.util.Optional.empty(), java.util.Optional.empty());
     }
 
-    public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam> params, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType> returnType) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem.Builder {
+    public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam> params, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType> returnType, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression> body) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem.Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction build() {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction(name, params, returnType);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction(name, params, returnType, body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.Builder name) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name.build(), params, returnType);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name.build(), params, returnType, body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withParams(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam> params) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam param) {
             var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam>(this.params);
             params.add(param);
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam.Builder param) {
             var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionParam>(this.params);
             params.add(param.build());
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withReturnType(java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType> returnType) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withReturnType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType returnType) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, java.util.Optional.of(returnType));
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, java.util.Optional.of(returnType), body);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withReturnType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder returnType) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, java.util.Optional.of(returnType.build()));
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, java.util.Optional.of(returnType.build()), body);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withBody(java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression> body) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, body);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withBody(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression body) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, java.util.Optional.of(body));
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder withBody(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder body) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder(name, params, returnType, java.util.Optional.of(body.build()));
         }
 
         // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction.Builder 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 c74f83b..55549b0 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
@@ -136,8 +136,7 @@ public class RustWriterTests {
         var string = write(writer -> writer.writeAssociatedItem(rust));
 
         assertThat(string, equalTo("""
-            fn width() {
-            }"""));
+            fn width();"""));
     }
 
     @Test
@@ -151,8 +150,7 @@ public class RustWriterTests {
         var string = write(writer -> writer.writeAssociatedItem(rust));
 
         assertThat(string, equalTo("""
-            fn area(width: i32, height: u64) {
-            }"""));
+            fn area(width: i32, height: u64);"""));
     }
 
     @Test
@@ -165,7 +163,23 @@ public class RustWriterTests {
         var string = write(writer -> writer.writeAssociatedItem(rust));
 
         assertThat(string, equalTo("""
-            fn area() -> i32 {
+            fn area() -> i32;"""));
+    }
+
+    @Test
+    public void functionWithBody() throws IOException {
+        var rust = RustFunction.arbitrary()
+            .withName(new RustIdentifier("predicate"))
+            .withBody(RustBlockExpression.arbitrary()
+                .withFinalOperand(RustBoolLiteral.arbitrary().withValue(false).build())
+                .build())
+            .build();
+
+        var string = write(writer -> writer.writeAssociatedItem(rust));
+
+        assertThat(string, equalTo("""
+            fn predicate() {
+                false
             }"""));
     }
 
@@ -192,11 +206,9 @@ public class RustWriterTests {
 
         assertThat(string, equalTo("""
             impl Square {
-                fn width() {
-                }
+                fn width();
 
-                fn height() {
-                }
+                fn height();
             }"""));
     }
 
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunctionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunctionMatcher.java
index 1526d18..acbc32c 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunctionMatcher.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustFunctionMatcher.java
@@ -46,6 +46,12 @@ public class RustFunctionMatcher implements org.zwobble.precisely.Matcher<java.l
         return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionMatcher(submatchers);
     }
 
+    public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionMatcher withBody(org.zwobble.precisely.Matcher<? super java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression>> body) {
+        var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction>>(this.submatchers);
+        submatchers.add(org.zwobble.precisely.Matchers.has("body", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction::body, body));
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionMatcher(submatchers);
+    }
+
     // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionMatcher body
     // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunctionMatcher body
 }