From 8dc5c03a23d1ab5f07848bbc217059de96eed30a Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 3 Jul 2026 12:14:30 +0100 Subject: Add expression statements to Rust AST --- .../compiler/output/lang/rust/RustWriter.java | 15 +++++++++ .../lang/rust/ast/RustExpressionStatement.java | 32 ++++++++++++++++++ .../output/lang/rust/ast/RustStatement.java | 18 ++++++++++ .../compiler/output/lang/rust/RustWriterTests.java | 13 ++++++++ .../rust/ast/RustExpressionStatementMatcher.java | 39 ++++++++++++++++++++++ 5 files changed, 117 insertions(+) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatement.java create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustStatement.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatementMatcher.java (limited to 'src') 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 299a8b5..23643a6 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 @@ -202,6 +202,21 @@ public class RustWriter implements AutoCloseable { this.writer.write("}"); } + // == Statements == + + void writeStatement(RustStatement statement) throws IOException { + switch (statement) { + case RustExpressionStatement expressionStatement -> { + this.writeExpressionStatement(expressionStatement); + } + } + } + + private void writeExpressionStatement(RustExpressionStatement expressionStatement) throws IOException { + this.writeExpression(expressionStatement.expression()); + this.writer.write(";"); + } + // == Expressions == void writeExpression(RustExpression expression) throws IOException { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatement.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatement.java new file mode 100644 index 0000000..3083b79 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatement.java @@ -0,0 +1,32 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement imports + +public record RustExpressionStatement(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression expression) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBoolLiteral.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression expression) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement(expression); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder withExpression(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression expression) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder(expression); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder withExpression(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder expression) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder(expression.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement body +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustStatement.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustStatement.java new file mode 100644 index 0000000..0e49c03 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustStatement.java @@ -0,0 +1,18 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement imports + +public sealed interface RustStatement permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement { + public interface Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement build(); + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement 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 96cdc83..a6f8069 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 @@ -245,6 +245,19 @@ public class RustWriterTests { }""")); } + // == Statements == + + @Test + public void expressionStatementIsExpressionFollowedBySemicolon() throws IOException { + var rust = RustExpressionStatement.arbitrary() + .withExpression(RustBoolLiteral.arbitrary().withValue(true).build()) + .build(); + + var string = write(writer -> writer.writeStatement(rust)); + + assertThat(string, equalTo("true;")); + } + // == Expressions == @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatementMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatementMatcher.java new file mode 100644 index 0000000..4e2479f --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatementMatcher.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.RustExpressionStatementMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatementMatcher imports + +public class RustExpressionStatementMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatementMatcher isRustExpressionStatement() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatementMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustExpressionStatementMatcher(java.util.List> 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 toMatcher() { + return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatementMatcher withExpression(org.zwobble.precisely.Matcher expression) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("expression", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement::expression, expression)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatementMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatementMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatementMatcher body +} -- cgit v1.2.3