From c4e0e6e62565c9e601ff45a366cf5dd31324c13c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 19 Jul 2026 17:26:35 +0100 Subject: Add path patterns to Rust AST --- .../compiler/output/lang/rust/RustWriter.java | 8 +++++ .../output/lang/rust/ast/RustPathPattern.java | 32 ++++++++++++++++++ .../compiler/output/lang/rust/ast/RustPattern.java | 2 +- .../compiler/output/lang/rust/RustWriterTests.java | 13 ++++++++ .../lang/rust/ast/RustPathPatternMatcher.java | 39 ++++++++++++++++++++++ 5 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPattern.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPatternMatcher.java (limited to 'src') 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 e3991c8..9c5361b 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 @@ -622,6 +622,10 @@ public class RustWriter implements AutoCloseable { this.writeIdentifierPattern(identifierPattern); } + case RustPathPattern pathPattern -> { + this.writePathPattern(pathPattern); + } + case RustWildcardPattern wildcardPattern -> { this.writeWildcardPattern(wildcardPattern); } @@ -634,6 +638,10 @@ public class RustWriter implements AutoCloseable { this.writeIdentifier(identifierPattern.variableName()); } + private void writePathPattern(RustPathPattern pathPattern) throws IOException { + this.writePath(pathPattern.path()); + } + private void writeWildcardPattern( RustWildcardPattern wildcardPattern ) throws IOException { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPattern.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPattern.java new file mode 100644 index 0000000..89395cb --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPattern.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.RustPathPattern imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern imports + +public record RustPathPattern(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath path) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath path) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPattern.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern(path); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder withPath(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath path) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder(path); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder withPath(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath.Builder path) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder(path.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern body +} 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 50ee8eb..b012a9c 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.RustWildcardPattern { +public sealed interface RustPattern permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifierPattern, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern, 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/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 d036f78..24a57a6 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 @@ -850,6 +850,19 @@ public class RustWriterTests { assertThat(string, equalTo("x")); } + // === Path patterns === + + @Test + public void pathPattern() throws IOException { + var rust = RustPathPattern.arbitrary() + .withPath(RustPath.of("X", "Y")) + .build(); + + var string = write(writer -> writer.writePattern(rust)); + + assertThat(string, equalTo("X::Y")); + } + // === Wildcard patterns === @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPatternMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPatternMatcher.java new file mode 100644 index 0000000..b231b83 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathPatternMatcher.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.RustPathPatternMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPatternMatcher imports + +public class RustPathPatternMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPatternMatcher isRustPathPattern() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPatternMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustPathPatternMatcher(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.RustPathPattern.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPatternMatcher withPath(org.zwobble.precisely.Matcher path) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("path", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPattern::path, path)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPatternMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPatternMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathPatternMatcher body +} -- cgit v1.2.3