Parse type params for native types

3 files changed, 90 insertions, 5 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNativeTypeDefinitionNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNativeTypeDefinitionNode.java
index 92501e4..43d642e 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNativeTypeDefinitionNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedNativeTypeDefinitionNode.java
@@ -7,32 +7,50 @@ package org.zwobble.hobgoblin.compiler.ast.untyped;
 
 public record UntypedNativeTypeDefinitionNode(
     String name,
+    java.util.List<org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode> typeParams,
     org.zwobble.hobgoblin.compiler.ast.DocComment docComment,
     org.zwobble.hobgoblin.compiler.sources.Source source
 ) implements org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNamespaceStatementNode {
     public static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder arbitrary() {
-        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder("", org.zwobble.hobgoblin.compiler.ast.HobgoblinNativeAst.arbitraryDocComment(), org.zwobble.hobgoblin.compiler.sources.HobgoblinNativeSources.arbitrarySource());
+        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder("", java.util.List.of(), org.zwobble.hobgoblin.compiler.ast.HobgoblinNativeAst.arbitraryDocComment(), org.zwobble.hobgoblin.compiler.sources.HobgoblinNativeSources.arbitrarySource());
     }
 
     public record Builder(
         String name,
+        java.util.List<org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode> typeParams,
         org.zwobble.hobgoblin.compiler.ast.DocComment docComment,
         org.zwobble.hobgoblin.compiler.sources.Source source
     ) implements org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNamespaceStatementNode.Builder {
         public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode build() {
-            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode(name, docComment, source);
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode(name, typeParams, docComment, source);
         }
 
         public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder withName(String name) {
-            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, docComment, source);
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, typeParams, docComment, source);
+        }
+
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder withTypeParams(java.util.List<org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode> typeParams) {
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, typeParams, docComment, source);
+        }
+
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder addTypeParam(org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode typeParam) {
+            var typeParams = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode>(this.typeParams);
+            typeParams.add(typeParam);
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, typeParams, docComment, source);
+        }
+
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder addTypeParam(org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder typeParam) {
+            var typeParams = new java.util.ArrayList<org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode>(this.typeParams);
+            typeParams.add(typeParam.build());
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, typeParams, docComment, source);
         }
 
         public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder withDocComment(org.zwobble.hobgoblin.compiler.ast.DocComment docComment) {
-            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, docComment, source);
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, typeParams, docComment, source);
         }
 
         public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder withSource(org.zwobble.hobgoblin.compiler.sources.Source source) {
-            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, docComment, source);
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder(name, typeParams, docComment, source);
         }
 
         // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode.Builder body
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedTypeParamNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedTypeParamNode.java
new file mode 100644
index 0000000..fe27b0a
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedTypeParamNode.java
@@ -0,0 +1,38 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.ast.untyped;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode imports
+// Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode imports
+
+public record UntypedTypeParamNode(
+    String name,
+    org.zwobble.hobgoblin.compiler.sources.Source source
+) {
+    public static org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder("", org.zwobble.hobgoblin.compiler.sources.HobgoblinNativeSources.arbitrarySource());
+    }
+
+    public record Builder(
+        String name,
+        org.zwobble.hobgoblin.compiler.sources.Source source
+    ) {
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode build() {
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode(name, source);
+        }
+
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder withName(String name) {
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder(name, source);
+        }
+
+        public org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder withSource(org.zwobble.hobgoblin.compiler.sources.Source source) {
+            return new org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder(name, source);
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode body
+    // Custom area end: org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeParamNode body
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
index ab88af0..1e03672 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
@@ -167,6 +167,9 @@ public class Parser {
 
         tokens.skip(TokenType.KEYWORD_NATIVE);
         var name = tokens.next(TokenType.IDENTIFIER);
+
+        var typeParams = parseTypeParams(tokens);
+
         tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
 
         tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
@@ -176,6 +179,7 @@ public class Parser {
 
         return new UntypedNativeTypeDefinitionNode(
             name.charSequence().toString(),
+            typeParams,
             docComment,
             source
         );
@@ -315,6 +319,31 @@ public class Parser {
         );
     }
 
+    private static List<UntypedTypeParamNode> parseTypeParams(TokenIterator tokens) {
+        if (!tokens.trySkip(TokenType.SYMBOL_SQUARE_OPEN)) {
+            return List.of();
+        }
+
+        var typeParams = parseMany(
+            () -> tokens.isNext(TokenType.SYMBOL_SQUARE_CLOSE),
+            () -> {
+                var start = tokens.startPosition();
+
+                var name = parseIdentifier(tokens);
+
+                var end = tokens.endPosition();
+                var source = createSource(start, end);
+
+                return new UntypedTypeParamNode(name, source);
+            },
+            () -> tokens.trySkip(TokenType.SYMBOL_COMMA)
+        );
+
+        tokens.skip(TokenType.SYMBOL_SQUARE_CLOSE);
+
+        return typeParams;
+    }
+
     static UntypedTypeLevelExpressionNode parseTypeLevelExpression(
         TokenIterator tokens
     ) {