diff options
7 files changed, 93 insertions, 4 deletions
diff --git a/hobgoblin/src/output/lang/rust/ast.hob b/hobgoblin/src/output/lang/rust/ast.hob index 6498908..8cbe166 100644 --- a/hobgoblin/src/output/lang/rust/ast.hob +++ b/hobgoblin/src/output/lang/rust/ast.hob @@ -26,9 +26,13 @@ struct RustEnumVariant { } sum RustEnumVariantFields { + variant RustEnumVariantNoFields; variant RustEnumVariantTuple; } +struct RustEnumVariantNoFields { +} + struct RustEnumVariantTuple { field fields: List[RustTupleField]; } 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 51de98a..602fd2a 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 @@ -78,10 +78,12 @@ public class RustWriter implements AutoCloseable { for (var variant : enum_.variants()) { this.writer.newLine(); writeIdentifier(variant.name()); - this.writer.write("("); switch (variant.fields()) { + case RustEnumVariantNoFields _ -> {} + case RustEnumVariantTuple tuple -> { + this.writer.write("("); writeWithSeparator( tuple.fields(), field -> { @@ -89,10 +91,11 @@ public class RustWriter implements AutoCloseable { }, () -> this.writer.write(", ") ); + this.writer.write(")"); } } - this.writer.write("),"); + this.writer.write(","); } this.writer.dedent(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariant.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariant.java index 3eff7a1..e28fc70 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariant.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariant.java @@ -7,7 +7,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; public record RustEnumVariant(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantFields fields) { public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariant.Builder arbitrary() { - return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariant.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantTuple.arbitrary().build()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariant.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields.arbitrary().build()); } public record Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantFields fields) { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantFields.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantFields.java index 56d39e6..7558076 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantFields.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantFields.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.RustEnumVariantFields imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantFields imports -public sealed interface RustEnumVariantFields permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantTuple { +public sealed interface RustEnumVariantFields permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantTuple { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantFields build(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantNoFields.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantNoFields.java new file mode 100644 index 0000000..da5553f --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantNoFields.java @@ -0,0 +1,24 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields imports + +public record RustEnumVariantNoFields() implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantFields { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields.Builder(); + } + + public record Builder() implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantFields.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields(); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields 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 84a1056..8b9bbe3 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 @@ -48,6 +48,31 @@ public class RustWriterTests { } @Test + public void enumWithFieldlessVariants() throws IOException { + var rust = RustEnum.arbitrary() + .withName(new RustIdentifier("Shape")) + .withVariants(List.of( + RustEnumVariant.arbitrary() + .withName(new RustIdentifier("Rectangle")) + .withFields(RustEnumVariantNoFields.arbitrary().build()) + .build(), + RustEnumVariant.arbitrary() + .withName(new RustIdentifier("Circle")) + .withFields(RustEnumVariantNoFields.arbitrary().build()) + .build() + )) + .build(); + + var string = write(writer -> writer.writeItem(rust)); + + assertThat(string, equalTo(""" + pub enum Shape { + Rectangle, + Circle, + }""")); + } + + @Test public void enumWithTupleVariants() throws IOException { var rust = RustEnum.arbitrary() .withName(new RustIdentifier("Shape")) diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantNoFieldsMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantNoFieldsMatcher.java new file mode 100644 index 0000000..382b819 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustEnumVariantNoFieldsMatcher.java @@ -0,0 +1,33 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFieldsMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFieldsMatcher imports + +public class RustEnumVariantNoFieldsMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFieldsMatcher isRustEnumVariantNoFields() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFieldsMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields>> submatchers; + + private RustEnumVariantNoFieldsMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFields>> 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.RustEnumVariantNoFields.class, this.submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFieldsMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustEnumVariantNoFieldsMatcher body +} |