diff options
6 files changed, 183 insertions, 4 deletions
diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob index e6d1f11..83b504c 100644 --- a/hobgoblin/src/output/lang/rust/ast.hob +++ b/hobgoblin/src/output/lang/rust/ast.hob @@ -13,6 +13,7 @@ sum RustItem { variant RustEnum; variant RustInherentImpl; variant RustStructStruct; + variant RustTraitImpl; } // === Functions === @@ -78,6 +79,12 @@ struct RustInherentImpl { field items: List[RustAssociatedItem]; } +struct RustTraitImpl { + field implementedTrait: RustTypePath; + field type: RustType; + field items: List[RustAssociatedItem]; +} + // === 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 6cd5860..cc00f82 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 @@ -6,6 +6,8 @@ import org.zwobble.hobgoblin.compiler.output.lang.rust.ast.*; import java.io.IOException; import java.nio.file.Path; +import java.util.List; +import java.util.Optional; import java.util.Set; import static org.zwobble.hobgoblin.compiler.output.CodeWriter.writeWithSeparator; @@ -70,6 +72,10 @@ public class RustWriter implements AutoCloseable { case RustStructStruct structStruct -> { writeStructStruct(structStruct); } + + case RustTraitImpl traitImpl -> { + writeTraitImpl(traitImpl); + } } } @@ -179,16 +185,42 @@ public class RustWriter implements AutoCloseable { // === Implementations === private void writeInherentImpl(RustInherentImpl inherentImpl) throws IOException { + this.writeImpl( + Optional.empty(), + inherentImpl.type(), + inherentImpl.items() + ); + } + + private void writeTraitImpl(RustTraitImpl traitImpl) throws IOException { + this.writeImpl( + Optional.of(traitImpl.implementedTrait()), + traitImpl.type(), + traitImpl.items() + ); + } + + private void writeImpl( + Optional<RustTypePath> implementedTrait, + RustType type, + List<RustAssociatedItem> items + ) throws IOException { this.writer.write("impl "); - this.writeType(inherentImpl.type()); + + if (implementedTrait.isPresent()) { + this.writeTypePath(implementedTrait.get()); + this.writer.write(" for "); + } + + this.writeType(type); this.writer.write(" {"); - if (!inherentImpl.items().isEmpty()) { + if (!items.isEmpty()) { this.writer.indent(); this.writer.newLine(); writeWithSeparator( - inherentImpl.items(), + items, item -> { this.writeAssociatedItem(item); 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 5da65a1..5385b88 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.RustInherentImpl, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStructStruct { +public sealed interface RustItem permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnum, 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 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/RustTraitImpl.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTraitImpl.java new file mode 100644 index 0000000..aed1d01 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTraitImpl.java @@ -0,0 +1,56 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl imports + +public record RustTraitImpl(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypePath implementedTrait, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem> items) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypePath.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypePath.arbitrary().build(), java.util.List.of()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypePath implementedTrait, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem> items) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl(implementedTrait, type, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder withImplementedTrait(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypePath implementedTrait) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(implementedTrait, type, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder withImplementedTrait(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypePath.Builder implementedTrait) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(implementedTrait.build(), type, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(implementedTrait, type, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder type) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(implementedTrait, type.build(), items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder withItems(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem> items) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(implementedTrait, type, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder addItem(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem item) { + var items = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem>(this.items); + items.add(item); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(implementedTrait, type, items); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder addItem(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem.Builder item) { + var items = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem>(this.items); + items.add(item.build()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder(implementedTrait, type, items); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl 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 3ed6e3e..dd3a7f9 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 @@ -265,6 +265,39 @@ public class RustWriterTests { }""")); } + @Test + public void emptyTraitImpl() throws IOException { + var rust = RustTraitImpl.arbitrary() + .withImplementedTrait(RustTypePath.of("Shape")) + .withType(RustTypePath.of("Square")) + .build(); + + var string = write(writer -> writer.writeItem(rust)); + + assertThat(string, equalTo(""" + impl Shape for Square { + }""")); + } + + @Test + public void traitImplWithAssociatedItems() throws IOException { + var rust = RustTraitImpl.arbitrary() + .withImplementedTrait(RustTypePath.of("Shape")) + .withType(RustTypePath.of("Square")) + .addItem(RustFunction.arbitrary().withName(new RustIdentifier("width"))) + .addItem(RustFunction.arbitrary().withName(new RustIdentifier("height"))) + .build(); + + var string = write(writer -> writer.writeItem(rust)); + + assertThat(string, equalTo(""" + impl Shape for Square { + pub fn width(); + + pub fn height(); + }""")); + } + // == Statements == @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTraitImplMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTraitImplMatcher.java new file mode 100644 index 0000000..a31ac13 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTraitImplMatcher.java @@ -0,0 +1,51 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher imports + +public class RustTraitImplMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher isRustTraitImpl() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl>> submatchers; + + private RustTraitImplMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl>> 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.RustTraitImpl.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher withImplementedTrait(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypePath> implementedTrait) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("implementedTrait", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl::implementedTrait, implementedTrait)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher 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.RustTraitImpl>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("type", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl::type, type)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher withItems(org.zwobble.precisely.Matcher<? super java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustAssociatedItem>> items) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("items", org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImpl::items, items)); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTraitImplMatcher body +} |