From 76259b1c4cb97d59573673fa7e645a394b27198e Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 3 Jul 2026 14:33:09 +0100 Subject: Add Rust path expressions --- .../compiler/output/lang/rust/RustWriterTests.java | 41 ++++++++++++++------ .../lang/rust/ast/RustPathExprSegmentMatcher.java | 45 ++++++++++++++++++++++ .../lang/rust/ast/RustPathInExpressionMatcher.java | 39 +++++++++++++++++++ 3 files changed, 114 insertions(+), 11 deletions(-) create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathExprSegmentMatcher.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathInExpressionMatcher.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 476a876..2090c1e 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 @@ -360,34 +360,35 @@ public class RustWriterTests { // == Paths == @Test - public void typeSegmentsAreSeparatedByDoubleColons() throws IOException { - var rust = RustTypePath.of("std", "string", "String"); + public void pathExprSegmentsAreSeparatedByDoubleColons() throws IOException { + var rust = RustPathInExpression.of("std", "string", "String"); - var string = write(writer -> writer.writeType(rust)); + var string = write(writer -> writer.writeExpression(rust)); assertThat(string, equalTo("std::string::String")); } @Test - public void crateTypeSegmentIsWritten() throws IOException { - var rust = RustTypePath.crate("a", "b"); + public void pathExprSegmentGenericArgsAreWritten() throws IOException { + var rust = RustPathInExpression.of("std", "collections", "HashMap") + .withArgs(List.of(RustTypePath.of("i32"), RustTypePath.of("f64"))); - var string = write(writer -> writer.writeType(rust)); + var string = write(writer -> writer.writeExpression(rust)); - assertThat(string, equalTo("crate::a::b")); + assertThat(string, equalTo("std::collections::HashMap::")); } @Test - public void globalTypeSegmentIsWritten() throws IOException { - var rust = RustTypePath.global("a", "b"); + public void typePathSegmentsAreSeparatedByDoubleColons() throws IOException { + var rust = RustTypePath.of("std", "string", "String"); var string = write(writer -> writer.writeType(rust)); - assertThat(string, equalTo("::a::b")); + assertThat(string, equalTo("std::string::String")); } @Test - public void typeSegmentGenericArgsAreWritten() throws IOException { + public void typePathSegmentGenericArgsAreWritten() throws IOException { var rust = RustTypePath.of("std", "collections", "HashMap") .withArgs(List.of(RustTypePath.of("i32"), RustTypePath.of("f64"))); @@ -396,6 +397,24 @@ public class RustWriterTests { assertThat(string, equalTo("std::collections::HashMap")); } + @Test + public void crateSegmentIsWritten() throws IOException { + var rust = RustTypePath.crate("a", "b"); + + var string = write(writer -> writer.writeType(rust)); + + assertThat(string, equalTo("crate::a::b")); + } + + @Test + public void globalSegmentIsWritten() throws IOException { + var rust = RustTypePath.global("a", "b"); + + var string = write(writer -> writer.writeType(rust)); + + assertThat(string, equalTo("::a::b")); + } + // == Identifiers == @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathExprSegmentMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathExprSegmentMatcher.java new file mode 100644 index 0000000..04fbe5b --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathExprSegmentMatcher.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.RustPathExprSegmentMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher imports + +public class RustPathExprSegmentMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher isRustPathExprSegment() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustPathExprSegmentMatcher(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.RustPathExprSegment.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher withPathIdentSegment(org.zwobble.precisely.Matcher pathIdentSegment) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("pathIdentSegment", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegment::pathIdentSegment, pathIdentSegment)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher withArgs(org.zwobble.precisely.Matcher>> args) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("args", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegment::args, args)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathExprSegmentMatcher body +} diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathInExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathInExpressionMatcher.java new file mode 100644 index 0000000..4fad401 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustPathInExpressionMatcher.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.RustPathInExpressionMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpressionMatcher imports + +public class RustPathInExpressionMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpressionMatcher isRustPathInExpression() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpressionMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustPathInExpressionMatcher(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.RustPathInExpression.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpressionMatcher withSegments(org.zwobble.precisely.Matcher> segments) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("segments", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpression::segments, segments)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpressionMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpressionMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPathInExpressionMatcher body +} -- cgit v1.2.3