From 83889b150c7e2da0bc3658054f4fe25cc0808392 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 17 Jul 2026 17:32:12 +0100 Subject: Add tuple expression to Rust AST --- .../compiler/output/lang/rust/RustWriter.java | 23 +++++++++++++ .../output/lang/rust/ast/RustExpression.java | 2 +- .../output/lang/rust/ast/RustTupleExpression.java | 40 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpression.java (limited to 'src/main/java/org') 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 ea3a38b..06c35c6 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 @@ -358,6 +358,10 @@ public class RustWriter implements AutoCloseable { case RustTryPropagationExpression tryPropagationExpression -> { this.writeTryPropagationExpression(tryPropagationExpression); } + + case RustTupleExpression tupleExpression -> { + this.writeTupleExpression(tupleExpression); + } } } @@ -462,6 +466,25 @@ public class RustWriter implements AutoCloseable { this.writer.write("?"); } + private void writeTupleExpression( + RustTupleExpression tupleExpression + ) throws IOException { + this.writer.write("("); + if (tupleExpression.elements().size() == 1) { + this.writeExpression(tupleExpression.elements().getFirst()); + this.writer.write(","); + } else if (tupleExpression.elements().size() > 1) { + writeWithSeparator( + tupleExpression.elements(), + this::writeExpression, + () -> { + this.writer.write(", "); + } + ); + } + this.writer.write(")"); + } + // == Types == void writeType(RustType type) throws IOException { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.java index bd6d86b..26fd95f 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustExpression.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.RustExpression imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression imports -public sealed interface RustExpression permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBoolLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustCallExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFieldExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIfExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPrefixExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStructExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression { +public sealed interface RustExpression permits org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustArrayRepeatExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBlockExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustBoolLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustCallExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustFieldExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIfExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPath, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustPrefixExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustStructExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTryPropagationExpression, org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression build(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpression.java new file mode 100644 index 0000000..d8f79c8 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTupleExpression.java @@ -0,0 +1,40 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.rust.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression imports + +public record RustTupleExpression(java.util.List elements) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(java.util.List.of()); + } + + public record Builder(java.util.List elements) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression build() { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression(elements); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder withElements(java.util.List elements) { + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(elements); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder addElement(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression element) { + var elements = new java.util.ArrayList(this.elements); + elements.add(element); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(elements); + } + + public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder addElement(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustExpression.Builder element) { + var elements = new java.util.ArrayList(this.elements); + elements.add(element.build()); + return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder(elements); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTupleExpression body +} -- cgit v1.2.3