diff options
| author | Michael Williamson <mike@zwobble.org> | 2026-07-02 10:03:41 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2026-07-02 10:03:41 +0100 |
| commit | 5447ee9766b101d20fdb1745b6f57411d6896264 (patch) | |
| tree | 649191053dc2419af234d13544479687c2ca6723 /src/main/java/org/zwobble | |
| parent | 066af00eebe662e5a589a4e274e1613201b36982 (diff) | |
Add fieldless enum variants to Rust AST
Diffstat (limited to 'src/main/java/org/zwobble')
4 files changed, 31 insertions, 4 deletions
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 +} |
