diff options
7 files changed, 151 insertions, 12 deletions
diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob index 812611d..28277b2 100644 --- a/hobgoblin/src/output/lang/rust/ast.hob +++ b/hobgoblin/src/output/lang/rust/ast.hob @@ -37,6 +37,7 @@ struct RustFunctionParam { struct RustTypeAlias { field name: RustIdentifier; + field params: List[RustTypeParam]; field type: RustType; } @@ -97,6 +98,12 @@ struct RustTraitImpl { field items: List[RustAssociatedItem]; } +// === Generic parameters === + +struct RustTypeParam { + field name: RustIdentifier; +} + // === Associated items === sum RustAssociatedItem { 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 858dfb3..7ae6bcf 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 @@ -133,6 +133,25 @@ public class RustWriter implements AutoCloseable { } } + // === Type aliases === + + private void writeTypeAlias(RustTypeAlias typeAlias) throws IOException { + this.writer.write("type "); + this.writeIdentifier(typeAlias.name()); + if (!typeAlias.params().isEmpty()) { + this.writer.write("<"); + writeWithSeparator( + typeAlias.params(), + this::writeTypeParam, + () -> this.writer.write(", ") + ); + this.writer.write(">"); + } + this.writer.write(" = "); + this.writeType(typeAlias.type()); + this.writer.write(";"); + } + // === Structs === private void writeStructStruct(RustStructStruct structStruct) throws IOException { @@ -260,12 +279,10 @@ 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(";"); + // === Generic parameters === + + private void writeTypeParam(RustTypeParam typeParam) throws IOException { + this.writeIdentifier(typeParam.name()); } // === Associated items === 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 index e58eb51..3c7493e 100644 --- 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 @@ -7,34 +7,52 @@ package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; public record RustTypeAlias( org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, + java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam> params, 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()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), java.util.List.of(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType.arbitrary().build()); } public record Builder( org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, + java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam> params, 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); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias(name, params, 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); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, 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); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name.build(), params, type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withParams(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam> params) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam param) { + var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>(this.params); + params.add(param); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder param) { + var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>(this.params); + params.add(param.build()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, 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); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, 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()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type.build()); } // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder body diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParam.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParam.java new file mode 100644 index 0000000..db689f4 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParam.java @@ -0,0 +1,36 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam imports + +public record RustTypeParam( + org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name +) { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build()); + } + + public record Builder( + org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name + ) { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam(name); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder(name); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.Builder name) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder(name.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam 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 f06b4a1..5b1fe95 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 @@ -121,6 +121,20 @@ public class RustWriterTests { assertThat(string, equalTo("type X = Y;")); } + @Test + public void typeAliasWithUnboundedTypeParam() throws IOException { + var rust = RustTypeAlias.arbitrary() + .withName(RustIdentifier.of("X")) + .addParam(RustTypeParam.arbitrary().withName(RustIdentifier.of("T1"))) + .addParam(RustTypeParam.arbitrary().withName(RustIdentifier.of("T2"))) + .withType(RustPath.of("Y")) + .build(); + + var string = write(writer -> writer.writeItem(rust)); + + assertThat(string, equalTo("type X<T1, T2> = 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 index 8cabb97..41ff267 100644 --- 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 @@ -36,6 +36,12 @@ public final class RustTypeAliasMatcher implements org.zwobble.precisely.Matcher return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher(submatchers); } + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAliasMatcher withParams(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>> params) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("params", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias::params, params)); + 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<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType> type) { var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias>>(this.submatchers); submatchers.add(org.zwobble.precisely.Matchers.has("type", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias::type, type)); diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParamMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParamMatcher.java new file mode 100644 index 0000000..99e09bc --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParamMatcher.java @@ -0,0 +1,41 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher imports + +public final class RustTypeParamMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher isRustTypeParam() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>> submatchers; + + private RustTypeParamMatcher( + java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>> 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.RustTypeParam.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher withName(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier> name) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("name", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam::name, name)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParamMatcher body +} |