diff options
7 files changed, 187 insertions, 2 deletions
diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob index f10c7e3..4887e9b 100644 --- a/hobgoblin/src/output/lang/rust/ast.hob +++ b/hobgoblin/src/output/lang/rust/ast.hob @@ -86,9 +86,15 @@ struct RustExpressionStatement { // == Expressions == sum RustExpression { + variant RustBlockExpression; variant RustBoolLiteral; } +struct RustBlockExpression { + field statements: List[RustStatement]; + field finalOperand: Option[RustExpression]; +} + struct RustBoolLiteral { field value: Bool; } 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 23643a6..f2a3c43 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 @@ -221,12 +221,35 @@ public class RustWriter implements AutoCloseable { void writeExpression(RustExpression expression) throws IOException { switch (expression) { + case RustBlockExpression blockExpression -> { + this.writeBlockExpression(blockExpression); + } + case RustBoolLiteral boolLiteral -> { this.writeBoolLiteral(boolLiteral); } } } + private void writeBlockExpression(RustBlockExpression blockExpression) throws IOException { + this.writer.write("{"); + this.writer.indent(); + + for (var statement : blockExpression.statements()) { + this.writer.newLine(); + this.writeStatement(statement); + } + + if (blockExpression.finalOperand().isPresent()) { + this.writer.newLine(); + this.writeExpression(blockExpression.finalOperand().get()); + } + + this.writer.dedent(); + this.writer.newLine(); + this.writer.write("}"); + } + private void writeBoolLiteral(RustBoolLiteral boolLiteral) throws IOException { this.writer.write(boolLiteral.value() ? "true" : "false"); } diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBlockExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBlockExpression.java new file mode 100644 index 0000000..794290d --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBlockExpression.java @@ -0,0 +1,44 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression imports + +public record RustBlockExpression(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement> statements, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> finalOperand) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder(java.util.List.of(), java.util.Optional.empty()); + } + + public record Builder(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement> statements, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> finalOperand) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression(statements, finalOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder withStatements(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement> statements) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder(statements, finalOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder addStatement(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement statement) { + var statements = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement>(this.statements); + statements.add(statement); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder(statements, finalOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder addStatement(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement.Builder statement) { + var statements = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement>(this.statements); + statements.add(statement.build()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder(statements, finalOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder withFinalOperand(java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> finalOperand) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder(statements, finalOperand); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression 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 f665e26..13c50b0 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.RustBoolLiteral { +public sealed interface RustExpression permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBoolLiteral { 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/RustExpressionStatement.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpressionStatement.java index 3083b79..3f5076d 100644 --- 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 @@ -7,7 +7,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; 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()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpressionStatement.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.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 { 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 a6f8069..33c1fe4 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 @@ -261,6 +261,73 @@ public class RustWriterTests { // == Expressions == @Test + public void blockExpressionWithNoStatementsAndNoFinalOperand() throws IOException { + var rust = RustBlockExpression.arbitrary().build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo(""" + { + }""")); + } + + @Test + public void blockExpressionWithStatementsAndNoFinalOperand() throws IOException { + var rust = RustBlockExpression.arbitrary() + .addStatement(RustExpressionStatement.arbitrary() + .withExpression(RustBoolLiteral.arbitrary().withValue(true)) + ) + .addStatement(RustExpressionStatement.arbitrary() + .withExpression(RustBoolLiteral.arbitrary().withValue(false)) + ) + .build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo(""" + { + true; + false; + }""")); + } + + @Test + public void blockExpressionWithNoStatementsAndFinalOperand() throws IOException { + var rust = RustBlockExpression.arbitrary() + .withFinalOperand(Optional.of(RustBoolLiteral.arbitrary().withValue(true).build())) + .build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo(""" + { + true + }""")); + } + + @Test + public void blockExpressionWithStatementsAndFinalOperand() throws IOException { + var rust = RustBlockExpression.arbitrary() + .addStatement(RustExpressionStatement.arbitrary() + .withExpression(RustBoolLiteral.arbitrary().withValue(true)) + ) + .addStatement(RustExpressionStatement.arbitrary() + .withExpression(RustBoolLiteral.arbitrary().withValue(false)) + ) + .withFinalOperand(Optional.of(RustBoolLiteral.arbitrary().withValue(true).build())) + .build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo(""" + { + true; + false; + true + }""")); + } + + @Test public void trueLiteral() throws IOException { var rust = RustBoolLiteral.arbitrary().withValue(true).build(); diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBlockExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBlockExpressionMatcher.java new file mode 100644 index 0000000..f002dce --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustBlockExpressionMatcher.java @@ -0,0 +1,45 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher imports + +public class RustBlockExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher isRustBlockExpression() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression>> submatchers; + + private RustBlockExpressionMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression>> 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.RustBlockExpression.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher withStatements(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStatement>> statements) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("statements", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression::statements, statements)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher withFinalOperand(org.zwobble.precisely.Matcher<? super java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression>> finalOperand) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("finalOperand", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression::finalOperand, finalOperand)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpressionMatcher body +} |