From b6008e5942036c8ebc258a62fc241760e2db9c1a Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 9 Aug 2026 16:49:34 +0100 Subject: Add basic type aliases to Rust AST --- .../compiler/output/lang/rust/RustWriter.java | 12 ++++++ .../compiler/output/lang/rust/ast/RustItem.java | 2 +- .../output/lang/rust/ast/RustTypeAlias.java | 46 +++++++++++++++++++++ .../compiler/output/lang/rust/RustWriterTests.java | 14 +++++++ .../output/lang/rust/ast/RustTypeAliasMatcher.java | 47 ++++++++++++++++++++++ 5 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAliasMatcher.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 a101528..858dfb3 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 @@ -86,6 +86,10 @@ public class RustWriter implements AutoCloseable { case RustTraitImpl traitImpl -> { writeTraitImpl(traitImpl); } + + case RustTypeAlias typeAlias -> { + writeTypeAlias(typeAlias); + } } } @@ -256,6 +260,14 @@ public class RustWriter implements AutoCloseable { this.writer.write("}"); } + private void writeTypeAlias(RustTypeAlias typeAlias) throws IOException { + this.writer.write("type "); + this.writeIdentifier(typeAlias.name()); + this.writer.write(" = "); + this.writeType(typeAlias.type()); + this.writer.write(";"); + } + // === Associated items === void writeAssociatedItem(RustAssociatedItem item) throws IOException { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustItem.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustItem.java index 9ade576..73cacb8 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustItem.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustItem.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.RustItem imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem imports -public sealed interface RustItem permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnum, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustInherentImpl, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStructStruct, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl { +public sealed interface RustItem permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnum, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFunction, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustInherentImpl, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStructStruct, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem build(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java new file mode 100644 index 0000000..e58eb51 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java @@ -0,0 +1,46 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias imports + +public record RustTypeAlias( + org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, + org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type +) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType.arbitrary().build()); + } + + public record Builder( + org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, + org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type + ) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias(name, type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.Builder name) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name.build(), type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder type) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, type.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias 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 0bf96e4..f06b4a1 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 @@ -107,6 +107,20 @@ public class RustWriterTests { }""")); } + // === Type aliases === + + @Test + public void basicTypeAlias() throws IOException { + var rust = RustTypeAlias.arbitrary() + .withName(RustIdentifier.of("X")) + .withType(RustPath.of("Y")) + .build(); + + var string = write(writer -> writer.writeItem(rust)); + + assertThat(string, equalTo("type X = Y;")); + } + // === Structs === @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAliasMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAliasMatcher.java new file mode 100644 index 0000000..8cabb97 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAliasMatcher.java @@ -0,0 +1,47 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher imports + +public final class RustTypeAliasMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher isRustTypeAlias() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private RustTypeAliasMatcher( + 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.RustTypeAlias.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher withName(org.zwobble.precisely.Matcher name) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("name", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias::name, name)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher withType(org.zwobble.precisely.Matcher type) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("type", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias::type, type)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher body +} -- cgit v1.2.3