diff options
6 files changed, 118 insertions, 1 deletions
diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob index b30a18d..f9fe379 100644 --- a/hobgoblin/src/output/lang/rust/ast.hob +++ b/hobgoblin/src/output/lang/rust/ast.hob @@ -121,6 +121,7 @@ struct RustLetStatement { // == Expressions == sum RustExpression { + variant RustArrayRepeatExpression; variant RustBlockExpression; variant RustBoolLiteral; variant RustCallExpression; @@ -131,6 +132,11 @@ sum RustExpression { variant RustStructExpression; } +struct RustArrayRepeatExpression { + field repeatOperand: RustExpression; + field lengthOperand: RustExpression; +} + struct RustBlockExpression { field statements: List[RustStatement]; field finalOperand: Option[RustExpression]; 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 eeb5134..43442d2 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 @@ -310,6 +310,10 @@ public class RustWriter implements AutoCloseable { void writeExpression(RustExpression expression) throws IOException { switch (expression) { + case RustArrayRepeatExpression arrayRepeatExpression -> { + this.writeArrayRepeatExpression(arrayRepeatExpression); + } + case RustBlockExpression blockExpression -> { this.writeBlockExpression(blockExpression); } @@ -344,6 +348,14 @@ public class RustWriter implements AutoCloseable { } } + private void writeArrayRepeatExpression(RustArrayRepeatExpression arrayRepeatExpression) throws IOException { + this.writer.write("["); + this.writeExpression(arrayRepeatExpression.repeatOperand()); + this.writer.write("; "); + this.writeExpression(arrayRepeatExpression.lengthOperand()); + this.writer.write("]"); + } + private void writeBlockExpression(RustBlockExpression blockExpression) throws IOException { this.writer.write("{"); this.writer.indent(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustArrayRepeatExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustArrayRepeatExpression.java new file mode 100644 index 0000000..3e5017c --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustArrayRepeatExpression.java @@ -0,0 +1,40 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression imports + +public record RustArrayRepeatExpression(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression repeatOperand, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression lengthOperand) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression repeatOperand, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression lengthOperand) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression(repeatOperand, lengthOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder withRepeatOperand(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression repeatOperand) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder(repeatOperand, lengthOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder withRepeatOperand(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder repeatOperand) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder(repeatOperand.build(), lengthOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder withLengthOperand(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression lengthOperand) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder(repeatOperand, lengthOperand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder withLengthOperand(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder lengthOperand) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder(repeatOperand, lengthOperand.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression 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 2bf502d..be39797 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.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.RustIntegerLiteral, 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.RustStructExpression { +public sealed interface RustExpression permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression, 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.RustIntegerLiteral, 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.RustStructExpression { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression build(); 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 800d77f..aa6c887 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 @@ -381,6 +381,20 @@ public class RustWriterTests { // == Expressions == + // === Array repeat expressions === + + @Test + public void arrayRepeatExpression() throws IOException { + var rust = RustArrayRepeatExpression.arbitrary() + .withRepeatOperand(RustIntegerLiteral.arbitrary().withValue(42)) + .withLengthOperand(RustIntegerLiteral.arbitrary().withValue(47)) + .build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo("[42; 47]")); + } + // === Block expressions === @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustArrayRepeatExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustArrayRepeatExpressionMatcher.java new file mode 100644 index 0000000..8ff968b --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustArrayRepeatExpressionMatcher.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.RustArrayRepeatExpressionMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher imports + +public class RustArrayRepeatExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher isRustArrayRepeatExpression() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression>> submatchers; + + private RustArrayRepeatExpressionMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression>> 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.RustArrayRepeatExpression.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher withRepeatOperand(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> repeatOperand) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("repeatOperand", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression::repeatOperand, repeatOperand)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher withLengthOperand(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> lengthOperand) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("lengthOperand", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression::lengthOperand, lengthOperand)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpressionMatcher body +} |