Open-Argon/Chloride
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix syntax error on single new line after if statement

Browse Source
This commit is contained in:
William Bell
2025-06-05 23:26:49 +01:00
parent d941b88b70
commit 5e1cf0c8b1
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser/dowrap/dowrap.c
View File

@@ -1,3 +1,4 @@
#include "dowrap.h"
#include "../../lexer/token.h" #include "../../lexer/token.h"
#include "../../memory.h" #include "../../memory.h"
#include "../parser.h" #include "../parser.h"
@@ -102,3 +103,10 @@ ParsedValue *parse_dowrap(char *file, DArray *tokens, size_t *index) {
return parsedValue; return parsedValue;
} }
void free_dowrap(void *ptr) {
ParsedValue *parsedValue = ptr;
DArray *parsed = parsedValue->data;
darray_free(parsed, free_parsed);
free(parsed);
}

27
src/parser/if/if.c
View File

@@ -1,13 +1,12 @@
#include "if.h" #include "if.h"
#include "../../lexer/token.h" #include "../../lexer/token.h"
#include "../../memory.h"
#include "../parser.h" #include "../parser.h"
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "../../memory.h"
ParsedValue *parse_if(char *file, DArray *tokens, ParsedValue *parse_if(char *file, DArray *tokens, size_t *index) {
size_t *index) {
(*index)++; (*index)++;
error_if_finished(file, tokens, index); error_if_finished(file, tokens, index);
@@ -24,7 +23,8 @@ ParsedValue *parse_if(char *file, DArray *tokens,
if (token->type != TOKEN_NEW_LINE) if (token->type != TOKEN_NEW_LINE)
break; // no more branches break; // no more branches
(*index)++; (*index)++;
error_if_finished(file, tokens, index); if ((*index) >= tokens->size)
break;
token = darray_get(tokens, *index); token = darray_get(tokens, *index);
if (token->type == TOKEN_ELSE || token->type == TOKEN_ELSE_IF) { if (token->type == TOKEN_ELSE || token->type == TOKEN_ELSE_IF) {
@@ -41,9 +41,8 @@ ParsedValue *parse_if(char *file, DArray *tokens,
// Parse ( condition ) // Parse ( condition )
token = darray_get(tokens, *index); token = darray_get(tokens, *index);
if (token->type != TOKEN_LPAREN) { if (token->type != TOKEN_LPAREN) {
fprintf(stderr, fprintf(stderr, "%s:%zu:%zu error: expected '(' after if\n", file,
"%s:%zu:%zu error: expected '(' after if\n", token->line, token->column);
file, token->line, token->column);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -66,8 +65,7 @@ ParsedValue *parse_if(char *file, DArray *tokens,
} }
if (token->type != TOKEN_RPAREN) { if (token->type != TOKEN_RPAREN) {
fprintf(stderr, fprintf(stderr, "%s:%zu:%zu error: missing closing ')' in condition\n",
"%s:%zu:%zu error: missing closing ')' in condition\n",
file, token->line, token->column); file, token->line, token->column);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -77,20 +75,19 @@ ParsedValue *parse_if(char *file, DArray *tokens,
} }
// Parse the body // Parse the body
ParsedValue *parsed_content = ParsedValue *parsed_content = parse_token(file, tokens, index, false);
parse_token(file, tokens, index, false);
if (!parsed_content) { if (!parsed_content) {
fprintf(stderr, fprintf(stderr, "%s:%zu:%zu error: expected body after condition\n", file,
"%s:%zu:%zu error: expected body after condition\n", token->line, token->column);
file, token->line, token->column);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
ParsedConditional conditional = {condition, parsed_content}; ParsedConditional conditional = {condition, parsed_content};
darray_push(parsed_if, &conditional); darray_push(parsed_if, &conditional);
expect_conditional = false; // After first iteration, expect newline + else/else if expect_conditional =
false; // After first iteration, expect newline + else/else if
} }
ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue)); ParsedValue *parsedValue = checked_malloc(sizeof(ParsedValue));

3
src/parser/parser.c
View File

@@ -187,5 +187,8 @@ void free_parsed(void *ptr) {
case AST_IF: case AST_IF:
free_parsed_if(parsed); free_parsed_if(parsed);
break; break;
case AST_DOWRAP:
free_dowrap(parsed);
break;
} }
} }

5
test.ar
View File

@@ -5,7 +5,9 @@ let a,
temp_result, temp_result,
compute_area(radius) = 3.1415, compute_area(radius) = 3.1415,
identity(x) = x, identity(x) = x,
f(x), f(x)=do
term.log("hello world")
,
g(y, z), g(y, z),
result, result,
z = 0, z = 0,
@@ -24,3 +26,4 @@ let a,
if (x) term.log("hello world") if (x) term.log("hello world")
else term.log("bruh")