From a2a1afd66b14746d247a395a46af1e3cccac9326 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 14 Jul 2026 21:49:44 +0100 Subject: Add reference types to Rust AST --- .../compiler/output/lang/rust/RustWriter.java | 20 ++++++++++- .../lang/rust/ast/RustMutableReferenceType.java | 32 ++++++++++++++++++ .../lang/rust/ast/RustSharedReferenceType.java | 32 ++++++++++++++++++ .../compiler/output/lang/rust/ast/RustType.java | 2 +- .../compiler/output/lang/rust/RustWriterTests.java | 22 ++++++++++++ .../rust/ast/RustMutableReferenceTypeMatcher.java | 39 ++++++++++++++++++++++ .../rust/ast/RustSharedReferenceTypeMatcher.java | 39 ++++++++++++++++++++++ 7 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceType.java create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceType.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceTypeMatcher.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceTypeMatcher.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 c0550fd..3c1bfba 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 @@ -324,7 +324,7 @@ public class RustWriter implements AutoCloseable { case RustPath path -> { this.writePath(path); } - + case RustPrefixExpression prefixExpression -> { this.writePrefixExpression(prefixExpression); } @@ -415,9 +415,17 @@ public class RustWriter implements AutoCloseable { writeImplTraitType(implTraitType); } + case RustMutableReferenceType mutableReferenceType -> { + writeMutableReferenceType(mutableReferenceType); + } + case RustPath path -> { writePath(path); } + + case RustSharedReferenceType sharedReferenceType -> { + writeSharedReferenceType(sharedReferenceType); + } } } @@ -426,6 +434,16 @@ public class RustWriter implements AutoCloseable { this.writePath(implTraitType.trait()); } + private void writeMutableReferenceType(RustMutableReferenceType mutableReferenceType) throws IOException { + this.writer.write("&mut "); + this.writeType(mutableReferenceType.referencedType()); + } + + private void writeSharedReferenceType(RustSharedReferenceType sharedReferenceType) throws IOException { + this.writer.write("&"); + this.writeType(sharedReferenceType.referencedType()); + } + // == Paths == private void writePath(RustPath path) throws IOException { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceType.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceType.java new file mode 100644 index 0000000..37c8ee4 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceType.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.RustMutableReferenceType imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType imports + +public record RustMutableReferenceType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType referencedType) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType referencedType) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType(referencedType); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder withReferencedType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType referencedType) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder(referencedType); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder withReferencedType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder referencedType) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder(referencedType.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType body +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceType.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceType.java new file mode 100644 index 0000000..a3131b1 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceType.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.RustSharedReferenceType imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType imports + +public record RustSharedReferenceType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType referencedType) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType referencedType) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType(referencedType); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder withReferencedType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType referencedType) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder(referencedType); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder withReferencedType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder referencedType) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder(referencedType.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType body +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustType.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustType.java index 41f1777..9c797ac 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustType.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustType.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.RustType imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType imports -public sealed interface RustType permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath { +public sealed interface RustType permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType 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 7f85b8a..6900f83 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 @@ -558,6 +558,28 @@ public class RustWriterTests { assertThat(string, equalTo("impl std::io::Read")); } + @Test + public void mutableReferenceType() throws IOException { + var rust = RustMutableReferenceType.arbitrary() + .withReferencedType(RustPath.of("i32")) + .build(); + + var string = write(writer -> writer.writeType(rust)); + + assertThat(string, equalTo("&mut i32")); + } + + @Test + public void sharedReferenceType() throws IOException { + var rust = RustSharedReferenceType.arbitrary() + .withReferencedType(RustPath.of("i32")) + .build(); + + var string = write(writer -> writer.writeType(rust)); + + assertThat(string, equalTo("&i32")); + } + // == Paths == @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceTypeMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceTypeMatcher.java new file mode 100644 index 0000000..875dac8 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustMutableReferenceTypeMatcher.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.RustMutableReferenceTypeMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceTypeMatcher imports + +public class RustMutableReferenceTypeMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceTypeMatcher isRustMutableReferenceType() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceTypeMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustMutableReferenceTypeMatcher(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.RustMutableReferenceType.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceTypeMatcher withReferencedType(org.zwobble.precisely.Matcher referencedType) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("referencedType", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceType::referencedType, referencedType)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceTypeMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceTypeMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustMutableReferenceTypeMatcher body +} diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceTypeMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceTypeMatcher.java new file mode 100644 index 0000000..1776707 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustSharedReferenceTypeMatcher.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.RustSharedReferenceTypeMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceTypeMatcher imports + +public class RustSharedReferenceTypeMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceTypeMatcher isRustSharedReferenceType() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceTypeMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustSharedReferenceTypeMatcher(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.RustSharedReferenceType.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceTypeMatcher withReferencedType(org.zwobble.precisely.Matcher referencedType) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("referencedType", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceType::referencedType, referencedType)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceTypeMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceTypeMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustSharedReferenceTypeMatcher body +} -- cgit v1.2.3