From 3d4581cbac49ff887a53c21d064b19750f02f6e6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 3 Jul 2026 12:31:42 +0100 Subject: Add body to Rust functions --- .../compiler/output/lang/rust/RustWriterTests.java | 30 +++++++++++++++------- .../output/lang/rust/ast/RustFunctionMatcher.java | 6 +++++ 2 files changed, 27 insertions(+), 9 deletions(-) (limited to 'src/test') 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> body) { + var submatchers = new java.util.ArrayList>(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 } -- cgit v1.2.3