Parse struct definition fields

2 files changed, 38 insertions, 0 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedStructDefinitionNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedStructDefinitionNode.java
index e86b141..50f1156 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedStructDefinitionNode.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/untyped/UntypedStructDefinitionNode.java
@@ -2,8 +2,11 @@ package org.zwobble.hobgoblin.compiler.ast.untyped;
 
 import org.zwobble.hobgoblin.compiler.sources.Source;
 
+import java.util.List;
+
 public record UntypedStructDefinitionNode(
     String name,
+    List<UntypedStructFieldDefinitionNode> fields,
     Source source
 ) implements UntypedNamespaceStatementNode {
 }
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 90f7f66..7a50bf5 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
@@ -40,11 +40,24 @@ public class Parser {
     static UntypedNamespaceStatementNode parseNamespaceStatement(
         TokenIterator tokens
     ) {
+        return parseStructDefinition(tokens);
+    }
+
+    private static UntypedStructDefinitionNode parseStructDefinition(
+        TokenIterator tokens
+    ) {
         var start = tokens.startPosition();
 
         tokens.skip(TokenType.KEYWORD_STRUCT);
         var name = tokens.next(TokenType.IDENTIFIER);
         tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
+
+        var fields = parseMany(
+            () -> tokens.isNext(TokenType.SYMBOL_BRACE_CLOSE),
+            () -> parseStructFieldDefinition(tokens),
+            () -> true
+        );
+
         tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
 
         var end = tokens.endPosition();
@@ -52,6 +65,28 @@ public class Parser {
 
         return new UntypedStructDefinitionNode(
             name.charSequence().toString(),
+            fields,
+            source
+        );
+    }
+
+    private static UntypedStructFieldDefinitionNode parseStructFieldDefinition(
+        TokenIterator tokens
+    ) {
+        var start = tokens.startPosition();
+
+        tokens.skip(TokenType.KEYWORD_FIELD);
+        var name = tokens.next(TokenType.IDENTIFIER);
+        tokens.skip(TokenType.SYMBOL_COLON);
+        var type = parseTypeLevelExpression(tokens);
+        tokens.skip(TokenType.SYMBOL_SEMICOLON);
+
+        var end = tokens.endPosition();
+        var source = createSource(start, end);
+
+        return new UntypedStructFieldDefinitionNode(
+            name.charSequence().toString(),
+            type,
             source
         );
     }