From 83889b150c7e2da0bc3658054f4fe25cc0808392 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 17 Jul 2026 17:32:12 +0100 Subject: Add tuple expression to Rust AST --- .../compiler/output/lang/rust/RustWriterTests.java | 35 +++++++++++++++++++ .../lang/rust/ast/RustTupleExpressionMatcher.java | 39 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpressionMatcher.java (limited to 'src/test/java/org') 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 ea6334f..eebc834 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 @@ -641,6 +641,41 @@ public class RustWriterTests { assertThat(string, equalTo("a?")); } + // === Tuple expressions === + + @Test + public void tupleExpressionUnit() throws IOException { + var rust = RustTupleExpression.arbitrary().build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo("()")); + } + + @Test + public void tupleExpressionSingleton() throws IOException { + var rust = RustTupleExpression.arbitrary() + .addElement(RustPath.of("a")) + .build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo("(a,)")); + } + + @Test + public void tupleExpressionManyElements() throws IOException { + var rust = RustTupleExpression.arbitrary() + .addElement(RustPath.of("a")) + .addElement(RustPath.of("b")) + .addElement(RustPath.of("c")) + .build(); + + var string = write(writer -> writer.writeExpression(rust)); + + assertThat(string, equalTo("(a, b, c)")); + } + // == Types == @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpressionMatcher.java new file mode 100644 index 0000000..450ae91 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpressionMatcher.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.RustTupleExpressionMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher imports + +public class RustTupleExpressionMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher isRustTupleExpression() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustTupleExpressionMatcher(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.RustTupleExpression.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher withElements(org.zwobble.precisely.Matcher> elements) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("elements", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression::elements, elements)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpressionMatcher body +} -- cgit v1.2.3