aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/shedlang/compiler/parser
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2024-12-11 00:17:53 +0000
committerMichael Williamson <mike@zwobble.org>2024-12-11 00:17:53 +0000
commit6f11bbeab6957974b3b30018deb46ef8ecde258f (patch)
tree00cd403eb6fb15e62d8d9b5bf92bd88ad5d8be8f /src/main/java/org/shedlang/compiler/parser
parentf68860bbe29064318869cca0eaa4b2a2f39bddac (diff)
Move field positionality from struct field to struct
Diffstat (limited to 'src/main/java/org/shedlang/compiler/parser')
-rw-r--r--src/main/java/org/shedlang/compiler/parser/Parser.java23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index 2f6256d9..a4a23554 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -990,19 +990,14 @@ public class Parser {
var typeLevelParams = parseTypeLevelParamsOptional(tokens);
tokens.skip(TokenType.SYMBOL_PAREN_OPEN);
+ var structHasPositionalFields = !tokens.isNext(TokenType.SYMBOL_DOT);
var fields = parseMany(
() -> tokens.isNext(TokenType.SYMBOL_PAREN_CLOSE),
- () -> parseStructFieldDefinition(tokens),
+ () -> parseStructFieldDefinition(tokens, structHasPositionalFields),
() -> tokens.trySkip(TokenType.SYMBOL_COMMA)
);
tokens.skip(TokenType.SYMBOL_PAREN_CLOSE);
- var anyPositionalFields = fields.stream().anyMatch(field -> field.isPositional());
- var anyNonPositionalFields = fields.stream().anyMatch(field -> !field.isPositional());
- if (anyPositionalFields && anyNonPositionalFields) {
- throw new InconsistentStructFieldsError(fields.get(0).source());
- }
-
tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
@@ -1014,14 +1009,18 @@ public class Parser {
visibility,
typeLevelParams,
fields,
+ structHasPositionalFields,
source
);
}
- private static UntypedStructFieldDefinitionNode parseStructFieldDefinition(TokenIterator<TokenType> tokens) {
+ private static UntypedStructFieldDefinitionNode parseStructFieldDefinition(
+ TokenIterator<TokenType> tokens,
+ boolean structHasPositionalFields
+ ) {
var start = tokens.position();
- var isPositional = !tokens.trySkip(TokenType.SYMBOL_DOT);
+ var fieldIsPositional = !tokens.trySkip(TokenType.SYMBOL_DOT);
var name = tokens.nextValue(TokenType.IDENTIFIER);
tokens.skip(TokenType.SYMBOL_COLON);
@@ -1031,7 +1030,11 @@ public class Parser {
var end = tokens.position();
var source = start.to(end);
- return new UntypedStructFieldDefinitionNode(name, type, isPositional, source);
+ if (structHasPositionalFields ^ fieldIsPositional) {
+ throw new InconsistentStructFieldsError(source);
+ }
+
+ return new UntypedStructFieldDefinitionNode(name, type, source);
}
static UntypedExpressionNode parseSubExpression(TokenIterator<TokenType> tokens, OperatorPrecedence parentPrecedence) {