diff options
6 files changed, 160 insertions, 1 deletions
diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob index 9e0746d..d1c7097 100644 --- a/hobgoblin/src/output/lang/rust/ast.hob +++ b/hobgoblin/src/output/lang/rust/ast.hob @@ -254,6 +254,7 @@ sum RustPattern { variant RustIdentifierPattern; variant RustLiteralPattern; variant RustPathPattern; + variant RustTupleStructPattern; variant RustWildcardPattern; } @@ -269,6 +270,11 @@ struct RustPathPattern { field path: RustPath; } +struct RustTupleStructPattern { + field constructor: RustPath; + field items: List[RustPattern]; +} + struct RustWildcardPattern {} // == Types == 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 0630e07..3f3f3d8 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 @@ -668,6 +668,10 @@ public class RustWriter implements AutoCloseable { this.writePathPattern(pathPattern); } + case RustTupleStructPattern tupleStructPattern -> { + this.writeTupleStructPattern(tupleStructPattern); + } + case RustWildcardPattern wildcardPattern -> { this.writeWildcardPattern(wildcardPattern); } @@ -690,6 +694,23 @@ public class RustWriter implements AutoCloseable { this.writePath(pathPattern.path()); } + private void writeTupleStructPattern( + RustTupleStructPattern tupleStructPattern + ) throws IOException { + this.writePath(tupleStructPattern.constructor()); + this.writer.write("("); + + writeWithSeparator( + tupleStructPattern.items(), + this::writePattern, + () -> { + this.writer.write(", "); + } + ); + + this.writer.write(")"); + } + private void writeWildcardPattern( RustWildcardPattern wildcardPattern ) throws IOException { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPattern.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPattern.java index c24a1ee..1271ceb 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPattern.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPattern.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.RustPattern imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern imports -public sealed interface RustPattern permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifierPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustLiteralPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustWildcardPattern { +public sealed interface RustPattern permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifierPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustLiteralPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustWildcardPattern { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern build(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleStructPattern.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleStructPattern.java new file mode 100644 index 0000000..f67aa81 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleStructPattern.java @@ -0,0 +1,48 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern imports + +public record RustTupleStructPattern(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath constructor, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern> items) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath.arbitrary().build(), java.util.List.of()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath constructor, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern> items) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern(constructor, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder withConstructor(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath constructor) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder(constructor, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder withConstructor(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath.Builder constructor) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder(constructor.build(), items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder withItems(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern> items) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder(constructor, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder addItem(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern item) { + var items = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern>(this.items); + items.add(item); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder(constructor, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder addItem(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern.Builder item) { + var items = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern>(this.items); + items.add(item.build()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder(constructor, items); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern 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 c766157..1d04b72 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 @@ -901,6 +901,45 @@ public class RustWriterTests { assertThat(string, equalTo("X::Y")); } + // === Tuple struct patterns === + + @Test + public void tupleStructPatternWithNoItems() throws IOException { + var rust = RustTupleStructPattern.arbitrary() + .withConstructor(RustPath.of("X", "Y")) + .build(); + + var string = write(writer -> writer.writePattern(rust)); + + assertThat(string, equalTo("X::Y()")); + } + + @Test + public void tupleStructPatternWithOneItem() throws IOException { + var rust = RustTupleStructPattern.arbitrary() + .withConstructor(RustPath.of("X", "Y")) + .addItem(RustIdentifierPattern.arbitrary().withVariableName(RustIdentifier.of("a"))) + .build(); + + var string = write(writer -> writer.writePattern(rust)); + + assertThat(string, equalTo("X::Y(a)")); + } + + @Test + public void tupleStructPatternWithMultipleItems() throws IOException { + var rust = RustTupleStructPattern.arbitrary() + .withConstructor(RustPath.of("X", "Y")) + .addItem(RustIdentifierPattern.arbitrary().withVariableName(RustIdentifier.of("a"))) + .addItem(RustIdentifierPattern.arbitrary().withVariableName(RustIdentifier.of("b"))) + .addItem(RustIdentifierPattern.arbitrary().withVariableName(RustIdentifier.of("c"))) + .build(); + + var string = write(writer -> writer.writePattern(rust)); + + assertThat(string, equalTo("X::Y(a, b, c)")); + } + // === Wildcard patterns === @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleStructPatternMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleStructPatternMatcher.java new file mode 100644 index 0000000..b725214 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleStructPatternMatcher.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.RustTupleStructPatternMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher imports + +public class RustTupleStructPatternMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher isRustTupleStructPattern() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern>> submatchers; + + private RustTupleStructPatternMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern>> 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.RustTupleStructPattern.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher withConstructor(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath> constructor) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("constructor", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern::constructor, constructor)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher withItems(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern>> items) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("items", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPattern::items, items)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleStructPatternMatcher body +} |