Fixed __Parser_parseCondition consuming ( without actually making…

… sure
loumadev · Nov 14, 2023 · 7e06202 · 7e06202
1 parent 1b55518
commit 7e06202
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/src/compiler/parser/Parser.c b/src/compiler/parser/Parser.c
@@ -456,13 +456,21 @@ ParserResult __Parser_parseCondition(Parser *parser) {
 	ExpressionASTNode *expression = NULL;
 	OptionalBindingConditionASTNode *bindingCondition = NULL;
 
-	// consume '('
-	LexerResult result = Lexer_nextToken(parser->lexer);
-	if(!result.success) return LexerToParserError(result);
-
+	// consume '(' optionally
+	bool hasOptionalParen = false;
 	LexerResult peek = Lexer_peekToken(parser->lexer, 1);
 	if(!peek.success) return LexerToParserError(peek);
 
+	if(peek.token->kind == TOKEN_LEFT_PAREN) {
+		LexerResult result = Lexer_nextToken(parser->lexer);
+		if(!result.success) return LexerToParserError(result);
+
+		hasOptionalParen = true;
+	}
+
+	peek = Lexer_peekToken(parser->lexer, 1);
+	if(!peek.success) return LexerToParserError(peek);
+
 	if(peek.token->kind == TOKEN_LET || peek.token->kind == TOKEN_VAR) {
 		ParserResult bindingConditionResult = __Parser_parseOptionalBindingCondition(parser);
 		if(!bindingConditionResult.success) return bindingConditionResult;
@@ -474,10 +482,16 @@ ParserResult __Parser_parseCondition(Parser *parser) {
 		expression = (ExpressionASTNode*)expressionResult.node;
 	}
 
-	// consume ')'
-	result = Lexer_nextToken(parser->lexer);
+	// consume ')' if we consumed '('
+	LexerResult result = Lexer_nextToken(parser->lexer);
 	if(!result.success) return LexerToParserError(result);
 
+	if(hasOptionalParen && result.token->kind != TOKEN_RIGHT_PAREN) {
+		return ParserError(
+			String_fromFormat("expected ')' in condition"),
+			Array_fromArgs(1, result.token));
+	}
+
 	ConditionASTNode *condition = new_ConditionASTNode(expression, bindingCondition);
 
 	return ParserSuccess(condition);