From 1e6b65207e0fc3ead1edbd2bb56b1578cfc647ec Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 10 Dec 2024 23:29:42 +0000 Subject: Add basic parsing of positional struct fields --- .../compiler/ast/untyped/UntypedStructFieldDefinitionNode.java | 1 + src/main/java/org/shedlang/compiler/parser/Parser.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java') 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 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 tokens, OperatorPrecedence parentPrecedence) { -- cgit v1.2.3