diff options
6 files changed, 101 insertions, 1 deletions
diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob index 37de1d6..dd71430 100644 --- a/hobgoblin/src/output/lang/rust/ast.hob +++ b/hobgoblin/src/output/lang/rust/ast.hob @@ -132,6 +132,7 @@ sum RustExpression { variant RustPath; variant RustPrefixExpression; variant RustStructExpression; + variant RustTryPropagationExpression; } struct RustArrayRepeatExpression { @@ -188,6 +189,10 @@ struct RustStructExprField { field value: RustExpression; } +struct RustTryPropagationExpression { + field operand: RustExpression; +} + // == Types == sum RustType { 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 b27a755..4acbb0e 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 @@ -354,6 +354,10 @@ public class RustWriter implements AutoCloseable { case RustStructExpression structExpression -> { this.writeStructExpression(structExpression); } + + case RustTryPropagationExpression tryPropagationExpression -> { + this.writeTryPropagationExpression(tryPropagationExpression); + } } } @@ -451,6 +455,13 @@ public class RustWriter implements AutoCloseable { this.writer.write("}"); } + private void writeTryPropagationExpression( + RustTryPropagationExpression tryPropagationExpression + ) throws IOException { + this.writeExpression(tryPropagationExpression.operand()); + this.writer.write("?"); + } + // == Types == void writeType(RustType type) throws IOException { 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 124f395..bd6d86b 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.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.RustIfExpression, 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.RustIfExpression, 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, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression { 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/RustTryPropagationExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTryPropagationExpression.java new file mode 100644 index 0000000..5a2f4b5 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTryPropagationExpression.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.RustTryPropagationExpression imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression imports + +public record RustTryPropagationExpression(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression operand) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression operand) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression(operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder withOperand(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression operand) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder(operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder withOperand(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder operand) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder(operand.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression 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 2568c42..bb40d71 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 @@ -628,6 +628,19 @@ public class RustWriterTests { assertThat(string, equalTo("X { a: b, c: d }")); } + // === Try propagation expressions === + + @Test + public void tryPropagationExpression() throws IOException { + var rust = RustTryPropagationExpression.arbitrary() + .withOperand(RustPath.of("a")) + .build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo("a?")); + } + // == Types == @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTryPropagationExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTryPropagationExpressionMatcher.java new file mode 100644 index 0000000..171718c --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTryPropagationExpressionMatcher.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.RustTryPropagationExpressionMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpressionMatcher imports + +public class RustTryPropagationExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpressionMatcher isRustTryPropagationExpression() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpressionMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression>> submatchers; + + private RustTryPropagationExpressionMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression>> 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.RustTryPropagationExpression.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpressionMatcher withOperand(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression> operand) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("operand", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression::operand, operand)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpressionMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpressionMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpressionMatcher body +} |