From 066af00eebe662e5a589a4e274e1613201b36982 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 2 Jul 2026 09:57:35 +0100 Subject: Support translating sums into Rust types --- examples/02-sum/hobgoblin.json5 | 4 +++ examples/02-sum/output/rust/.gitignore | 1 + examples/02-sum/output/rust/Cargo.lock | 7 +++++ examples/02-sum/output/rust/Cargo.toml | 6 +++++ examples/02-sum/output/rust/rust-toolchain.toml | 2 ++ examples/02-sum/output/rust/src/main.rs | 16 +++++++++++ examples/02-sum/output/rust/src/shapes.rs | 15 +++++++++++ .../generators/rusttypes/RustTypesGenerator.java | 31 +++++++++++++++++++++- 8 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 examples/02-sum/output/rust/.gitignore create mode 100644 examples/02-sum/output/rust/Cargo.lock create mode 100644 examples/02-sum/output/rust/Cargo.toml create mode 100644 examples/02-sum/output/rust/rust-toolchain.toml create mode 100644 examples/02-sum/output/rust/src/main.rs create mode 100644 examples/02-sum/output/rust/src/shapes.rs diff --git a/examples/02-sum/hobgoblin.json5 b/examples/02-sum/hobgoblin.json5 index 1ec9568..2bf59c3 100644 --- a/examples/02-sum/hobgoblin.json5 +++ b/examples/02-sum/hobgoblin.json5 @@ -5,5 +5,9 @@ path: "output/java/src/gen/java", packageName: "org.zwobble.example.types" }, + { + generator: "rust-types", + path: "output/rust/src", + }, ], } diff --git a/examples/02-sum/output/rust/.gitignore b/examples/02-sum/output/rust/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/examples/02-sum/output/rust/.gitignore @@ -0,0 +1 @@ +/target diff --git a/examples/02-sum/output/rust/Cargo.lock b/examples/02-sum/output/rust/Cargo.lock new file mode 100644 index 0000000..9dc6e3e --- /dev/null +++ b/examples/02-sum/output/rust/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "example" +version = "0.1.0" diff --git a/examples/02-sum/output/rust/Cargo.toml b/examples/02-sum/output/rust/Cargo.toml new file mode 100644 index 0000000..5d4c622 --- /dev/null +++ b/examples/02-sum/output/rust/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "example" +version = "0.1.0" +edition = "2024" + +[dependencies] diff --git a/examples/02-sum/output/rust/rust-toolchain.toml b/examples/02-sum/output/rust/rust-toolchain.toml new file mode 100644 index 0000000..4fedb95 --- /dev/null +++ b/examples/02-sum/output/rust/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.96" diff --git a/examples/02-sum/output/rust/src/main.rs b/examples/02-sum/output/rust/src/main.rs new file mode 100644 index 0000000..010ea2a --- /dev/null +++ b/examples/02-sum/output/rust/src/main.rs @@ -0,0 +1,16 @@ +mod shapes; + +use shapes::{Rectangle, Shape, Triangle}; + +fn main() { + let shape = create_shape(); + + let area = match shape { + Shape::Rectangle(rectangle) => rectangle.width * rectangle.height, + Shape::Triangle(triangle) => triangle.width * triangle.height / 2, + }; +} + +fn create_shape() -> Shape { + Shape::Rectangle(Rectangle { width: 10, height: 25 }) +} diff --git a/examples/02-sum/output/rust/src/shapes.rs b/examples/02-sum/output/rust/src/shapes.rs new file mode 100644 index 0000000..9bb32f4 --- /dev/null +++ b/examples/02-sum/output/rust/src/shapes.rs @@ -0,0 +1,15 @@ +/// A 2D shape. +pub enum Shape { + Rectangle(crate::shapes::Rectangle), + Triangle(crate::shapes::Triangle), +} + +pub struct Rectangle { + pub width: i32, + pub height: i32, +} + +pub struct Triangle { + pub width: i32, + pub height: i32, +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java index 99151c4..e681a3e 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/rusttypes/RustTypesGenerator.java @@ -92,7 +92,7 @@ public class RustTypesGenerator implements Generator { } case TypedSumDefinitionNode sumDefinition -> { - yield List.of(); + yield generateSumDefinition(sumDefinition, context); } }; } @@ -115,6 +115,26 @@ public class RustTypesGenerator implements Generator { return List.of(rustStruct); } + private List generateSumDefinition( + TypedSumDefinitionNode sumDefinition, + Context context + ) { + var rustEnumName = generateTypeName(sumDefinition.name()); + + var rustVariants = sumDefinition.variants().stream() + .map(variant -> new RustEnumVariant( + generateVariantName(variant.type().value()), + new RustEnumVariantTuple(List.of( + new RustTupleField(generateRustTypeExpression(variant.type(), context)) + )) + )) + .toList(); + + var rustEnum = new RustEnum(rustEnumName, rustVariants, sumDefinition.docComment()); + + return List.of(rustEnum); + } + private RustType generateRustTypeExpression( TypedTypeLevelExpressionNode type, Context context @@ -196,6 +216,15 @@ public class RustTypesGenerator implements Generator { return new RustIdentifier(Casing.lowerCamelCaseToSnakeCase(part)); } + private RustIdentifier generateVariantName(Type type) { + if (type instanceof StructType structType) { + return generateTypeName(structType.name()); + } else { + throw new UnsupportedOperationException("TODO"); + } + + } + private static class Context { private final NamespaceName currentNamespaceName; -- cgit v1.2.3