From 927ae58be68fcf2a541c1af2a7b27d845e97dea6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 29 Oct 2023 20:42:56 +0000 Subject: Parse params without types --- src/main/java/org/shedlang/compiler/parser/Parser.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/shedlang/compiler/parser') diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index a0edcd9b..cf01705d 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -640,15 +640,18 @@ public class Parser { var isNamed = tokens.trySkip(TokenType.SYMBOL_DOT); var name = tokens.nextValue(TokenType.IDENTIFIER); - tokens.skip(TokenType.SYMBOL_COLON); - var type = parseTopLevelTypeLevelExpression(tokens); - if (!isNamed && !named.isEmpty()) { - throw new PositionalParamAfterNamedParamError(type.source()); - } + + var type = tokens.trySkip(TokenType.SYMBOL_COLON) + ? Optional.of(parseTopLevelTypeLevelExpression(tokens)) + : Optional.empty(); var paramEnd = tokens.position(); var paramSource = paramStart.to(paramEnd); + if (!isNamed && !named.isEmpty()) { + throw new PositionalParamAfterNamedParamError(paramSource); + } + (isNamed ? named : positional).add(new UntypedParamNode(name, type, paramSource)); return null; -- cgit v1.2.3