Merge pull request #2597 from odin-lang/ordered-named-arguments

Allowing for Positional and Named Arguments in Procedure Calls

1 files changed, 8 insertions, 4 deletions

diff --git a/src/parser.cpp b/src/parser.cpp
index 883342b21..b756412ff 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2752,9 +2752,9 @@ gb_internal Ast *parse_call_expr(AstFile *f, Ast *operand) {
 
 	open_paren = expect_token(f, Token_OpenParen);
 
+	bool seen_ellipsis = false;
 	while (f->curr_token.kind != Token_CloseParen &&
-	       f->curr_token.kind != Token_EOF &&
-	       ellipsis.pos.line == 0) {
+	       f->curr_token.kind != Token_EOF) {
 		if (f->curr_token.kind == Token_Comma) {
 			syntax_error(f->curr_token, "Expected an expression not ,");
 		} else if (f->curr_token.kind == Token_Eq) {
@@ -2777,11 +2777,15 @@ gb_internal Ast *parse_call_expr(AstFile *f, Ast *operand) {
 
 			Ast *value = parse_value(f);
 			arg = ast_field_value(f, arg, value, eq);
-
-
+		} else if (seen_ellipsis) {
+			syntax_error(arg, "Positional arguments are not allowed after '..'");
 		}
 		array_add(&args, arg);
 
+		if (ellipsis.pos.line != 0) {
+			seen_ellipsis = true;
+		}
+
 		if (!allow_field_separator(f)) {
 			break;
 		}