Add params to type aliases in Rust AST

3 files changed, 83 insertions, 12 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 858dfb3..7ae6bcf 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
@@ -133,6 +133,25 @@ public class RustWriter implements AutoCloseable {
         }
     }
 
+    // === Type aliases ===
+
+    private void writeTypeAlias(RustTypeAlias typeAlias) throws IOException {
+        this.writer.write("type ");
+        this.writeIdentifier(typeAlias.name());
+        if (!typeAlias.params().isEmpty()) {
+            this.writer.write("<");
+            writeWithSeparator(
+                typeAlias.params(),
+                this::writeTypeParam,
+                () -> this.writer.write(", ")
+            );
+            this.writer.write(">");
+        }
+        this.writer.write(" = ");
+        this.writeType(typeAlias.type());
+        this.writer.write(";");
+    }
+
     // === Structs ===
 
     private void writeStructStruct(RustStructStruct structStruct) throws IOException {
@@ -260,12 +279,10 @@ public class RustWriter implements AutoCloseable {
         this.writer.write("}");
     }
 
-    private void writeTypeAlias(RustTypeAlias typeAlias) throws IOException {
-        this.writer.write("type ");
-        this.writeIdentifier(typeAlias.name());
-        this.writer.write(" = ");
-        this.writeType(typeAlias.type());
-        this.writer.write(";");
+    // === Generic parameters ===
+
+    private void writeTypeParam(RustTypeParam typeParam) throws IOException {
+        this.writeIdentifier(typeParam.name());
     }
 
     // === Associated items ===
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java
index e58eb51..3c7493e 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeAlias.java
@@ -7,34 +7,52 @@ package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
 
 public record RustTypeAlias(
     org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name,
+    java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam> params,
     org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type
 ) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem {
     public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder arbitrary() {
-        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType.arbitrary().build());
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build(), java.util.List.of(), org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustImplTraitType.arbitrary().build());
     }
 
     public record Builder(
         org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name,
+        java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam> params,
         org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type
     ) implements org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustItem.Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias build() {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias(name, type);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias(name, params, type);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, type);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.Builder name) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name.build(), type);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name.build(), params, type);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withParams(java.util.List<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam> params) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam param) {
+            var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>(this.params);
+            params.add(param);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder addParam(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder param) {
+            var params = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam>(this.params);
+            params.add(param.build());
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType type) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, type);
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type);
         }
 
         public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustType.Builder type) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, type.build());
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder(name, params, type.build());
         }
 
         // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeAlias.Builder body
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParam.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParam.java
new file mode 100644
index 0000000..db689f4
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/rust/ast/RustTypeParam.java
@@ -0,0 +1,36 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.rust.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam imports
+
+public record RustTypeParam(
+    org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name
+) {
+    public static org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.arbitrary().build());
+    }
+
+    public record Builder(
+        org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name
+    ) {
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam(name);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier name) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder(name);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder withName(org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustIdentifier.Builder name) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder(name.build());
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.rust.ast.RustTypeParam body
+}