From 1e6b65207e0fc3ead1edbd2bb56b1578cfc647ec Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 10 Dec 2024 23:29:42 +0000
Subject: Add basic parsing of positional struct fields

---
 .../untyped/UntypedStructFieldDefinitionNode.java  |  1 +
 .../java/org/shedlang/compiler/parser/Parser.java  |  4 +--
 .../org/shedlang/compiler/ast/untyped/Untyped.java |  2 +-
 .../UntypedStructFieldDefinitionNodeMatcher.java   |  4 +++
 .../parser/ParserStructDefinitionTests.java        | 29 +++++++++++++++++++++-
 5 files changed, 36 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java
index b2e69866..54883140 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNode.java
@@ -5,6 +5,7 @@ import org.shedlang.compiler.sources.Source;
 public record UntypedStructFieldDefinitionNode(
     String name,
     UntypedTypeLevelExpressionNode type,
+    boolean isPositional,
     Source source
 ) implements UntypedNode {
 }
diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index caa94e87..faf75600 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -1015,7 +1015,7 @@ public class Parser {
     private static UntypedStructFieldDefinitionNode parseStructFieldDefinition(TokenIterator<TokenType> tokens) {
         var start = tokens.position();
 
-        tokens.skip(TokenType.SYMBOL_DOT);
+        var isPositional = !tokens.trySkip(TokenType.SYMBOL_DOT);
         var name = tokens.nextValue(TokenType.IDENTIFIER);
 
         tokens.skip(TokenType.SYMBOL_COLON);
@@ -1025,7 +1025,7 @@ public class Parser {
         var end = tokens.position();
         var source = start.to(end);
 
-        return new UntypedStructFieldDefinitionNode(name, type, source);
+        return new UntypedStructFieldDefinitionNode(name, type, isPositional, source);
     }
 
     static UntypedExpressionNode parseSubExpression(TokenIterator<TokenType> tokens, OperatorPrecedence parentPrecedence) {
diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java b/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java
index 2eacfade..43e8154c 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java
@@ -189,7 +189,7 @@ public class Untyped {
         String name,
         UntypedTypeLevelExpressionNode type
     ) {
-        return new UntypedStructFieldDefinitionNode(name, type, Sources.NULL);
+        return new UntypedStructFieldDefinitionNode(name, type, false, Sources.NULL);
     }
 
     public static UntypedBinaryOperationNode sub(
diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNodeMatcher.java
index 2e0f1d63..5ca0d994 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNodeMatcher.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedStructFieldDefinitionNodeMatcher.java
@@ -34,4 +34,8 @@ public class UntypedStructFieldDefinitionNodeMatcher extends MatcherBuilder<Unty
     public UntypedStructFieldDefinitionNodeMatcher withType(Matcher<UntypedTypeLevelExpressionNode> type) {
         return with(has("type", x -> x.type(), type));
     }
+
+    public UntypedStructFieldDefinitionNodeMatcher withIsPositional(boolean isPositional) {
+        return with(has("isPositional", x -> x.isPositional(), equalTo(isPositional)));
+    }
 }
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java
index 903c4c52..4f0698ad 100644
--- a/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/parser/ParserStructDefinitionTests.java
@@ -40,10 +40,37 @@ public class ParserStructDefinitionTests {
                 .withFields(isSequence(
                     isUntypedStructFieldDefinitionNode()
                         .withName("name")
-                        .withType(isUntypedTypeLevelReferenceNode("String")),
+                        .withType(isUntypedTypeLevelReferenceNode("String"))
+                        .withIsPositional(false),
                     isUntypedStructFieldDefinitionNode()
                         .withName("accessLevel")
                         .withType(isUntypedTypeLevelReferenceNode("AccessLevel"))
+                        .withIsPositional(false)
+                ))
+        );
+    }
+
+    @Test
+    public void canParseStructWithPositionalFields() {
+        var source = """
+            struct X(name: String, accessLevel: AccessLevel) {}
+        """;
+
+        var node = parseString(source, Parser::parseNamespaceStatement);
+
+        assertThat(
+            node,
+            isUntypedStructDefinitionNode()
+                .withName("X")
+                .withFields(isSequence(
+                    isUntypedStructFieldDefinitionNode()
+                        .withName("name")
+                        .withType(isUntypedTypeLevelReferenceNode("String"))
+                        .withIsPositional(true),
+                    isUntypedStructFieldDefinitionNode()
+                        .withName("accessLevel")
+                        .withType(isUntypedTypeLevelReferenceNode("AccessLevel"))
+                        .withIsPositional(true)
                 ))
         );
     }
-- 
cgit v1.2.3