From 3cb64a2536dabcb89f449e81fa5453e528ecd446 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 6 Jun 2023 20:05:58 +0100 Subject: Only allow positional args before named args --- src/main/java/org/shedlang/compiler/parser/Parser.java | 7 +++---- .../compiler/parser/PositionalArgAfterNamedArgError.java | 11 +++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/shedlang/compiler/parser/PositionalArgAfterNamedArgError.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index 855634e7..74f9a79b 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -52,10 +52,9 @@ public class Parser { named.add(new UntypedNamedArgNode(argName, expression, argSource)); } else { var expression = parseTopLevelExpression(tokens); - // TODO: -// if (named.isEmpty()) { -// throw new PositionalArgAfterNamedArgError(tokens.peek()); -// } + if (!named.isEmpty()) { + throw new PositionalArgAfterNamedArgError(expression.source()); + } positional.add(expression); } return null; diff --git a/src/main/java/org/shedlang/compiler/parser/PositionalArgAfterNamedArgError.java b/src/main/java/org/shedlang/compiler/parser/PositionalArgAfterNamedArgError.java new file mode 100644 index 00000000..11a8d177 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/parser/PositionalArgAfterNamedArgError.java @@ -0,0 +1,11 @@ +package org.shedlang.compiler.parser; + +import org.shedlang.compiler.errors.SourceError; +import org.shedlang.compiler.sources.Source; + +public class PositionalArgAfterNamedArgError extends SourceError { + public PositionalArgAfterNamedArgError(Source source) { + super("Positional arg cannot follow named arg", source); + } +} + -- cgit v1.2.3