Serialize formal type parameters in C# backend

3 files changed, 29 insertions, 2 deletions

diff --git a/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java b/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java
index 3a1b81b..db14773 100644
--- a/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java
+++ b/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java
@@ -10,12 +10,14 @@ import java.util.Optional;
 import java.util.function.Function;
 
 import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg;
+import static org.zwobble.couscous.ast.FormalTypeParameterNode.formalTypeParameter;
 import static org.zwobble.couscous.ast.VariableDeclaration.var;
 import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class ClassNodeBuilder {
     private final TypeName name;
     private final ImmutableSet.Builder<TypeName> superTypes;
+    private final ImmutableList.Builder<FormalTypeParameterNode> typeParameters;
     private final ImmutableList.Builder<FieldDeclarationNode> fields;
     private List<StatementNode> staticConstructor;
     private Optional<ConstructorNode> constructor;
@@ -23,6 +25,7 @@ public class ClassNodeBuilder {
 
     public ClassNodeBuilder(TypeName name) {
         this.name = name;
+        this.typeParameters = ImmutableList.builder();
         this.superTypes = ImmutableSet.builder();
         this.fields = ImmutableList.builder();
         staticConstructor = list();
@@ -34,6 +37,11 @@ public class ClassNodeBuilder {
         this(TypeName.of(name));
     }
 
+    public ClassNodeBuilder addTypeParameter(String name) {
+        this.typeParameters.add(formalTypeParameter(TypeName.of(name)));
+        return this;
+    }
+
     public ClassNodeBuilder addSuperType(String type) {
         this.superTypes.add(TypeName.of(type));
         return this;
@@ -104,7 +112,7 @@ public class ClassNodeBuilder {
     public ClassNode build() {
         return ClassNode.declareClass(
             name,
-            list(),
+            typeParameters.build(),
             superTypes.build(),
             fields.build(),
             staticConstructor,
@@ -115,7 +123,7 @@ public class ClassNodeBuilder {
     public InterfaceNode buildInterface() {
         return InterfaceNode.declareInterface(
             name,
-            list(),
+            typeParameters.build(),
             superTypes.build(),
             methods.build());
     }
diff --git a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java
index 9de6e5d..b2d7408 100644
--- a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java
+++ b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java
@@ -14,6 +14,10 @@ public class FormalTypeParameterNode implements Node {
         this.name = name;
     }
 
+    public TypeName getName() {
+        return name;
+    }
+
     public FormalTypeParameterNode transform(NodeTransformer transformer) {
         return new FormalTypeParameterNode(transformer.transform(name));
     }
diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
index 036ee39..33187a2 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
@@ -337,6 +337,7 @@ public class CsharpSerializer implements NodeVisitor {
                 writer.writeKeyword(keyword);
                 writer.writeSpace();
                 writer.writeIdentifier(node.getName().getSimpleName());
+                writeTypeParameters(node);
                 writeSuperTypes(node);
                 writer.startBlock();
                 writeBody.run();
@@ -347,6 +348,20 @@ public class CsharpSerializer implements NodeVisitor {
         });
     }
 
+    private void writeTypeParameters(TypeNode node) {
+        if (!node.getTypeParameters().isEmpty()) {
+            writer.writeSymbol("<");
+            writer.writeWithSeparator(
+                node.getTypeParameters(),
+                parameter -> writeTypeReference(parameter.getName()),
+                () -> {
+                    writer.writeSymbol(",");
+                    writer.writeSpace();
+                });
+            writer.writeSymbol(">");
+        }
+    }
+
     private void writeSuperTypes(TypeNode node) {
         if (!node.getSuperTypes().isEmpty()) {
             writer.writeSpace();