fix bug causing parser to miss new lines after let.

This commit is contained in:
2025-06-05 23:18:25 +01:00
parent 000845ab25
commit d941b88b70
4 changed files with 36 additions and 10 deletions

View File

@@ -100,12 +100,14 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
break;
token = darray_get(tokens, *index);
}
skip_newlines_and_indents(tokens, index);
size_t count = skip_newlines_and_indents(tokens, index);
if ((*index) >= tokens->size)
break;
token = darray_get(tokens, *index);
if (token->type != TOKEN_COMMA)
if (token->type != TOKEN_COMMA) {
(*index)-=count;
break;
}
(*index)++;
error_if_finished(file, tokens, index);
skip_newlines_and_indents(tokens, index);

View File

@@ -30,19 +30,22 @@ void error_if_finished(char *file, DArray *tokens, size_t *index) {
}
}
void skip_newlines_and_indents(DArray *tokens, size_t *index) {
size_t skip_newlines_and_indents(DArray *tokens, size_t *index) {
bool passed = false;
size_t count = 0;
while (!passed && (*index) < tokens->size) {
Token *token = darray_get(tokens, *index);
switch (token->type) {
case TOKEN_NEW_LINE:
case TOKEN_INDENT:
count++;
(*index)++;
break;
default:
passed = true;
}
}
return count;
}
ParsedValue *parse_token(char *file, DArray *tokens, size_t *index,
@@ -140,10 +143,11 @@ void parser(char *file, DArray *parsed, DArray *tokens, bool inline_flag) {
size_t index = 0;
bool expecting_new_line = false;
while (index < tokens->size) {
size_t old_index = index;
ParsedValue *parsed_code = parse_token(file, tokens, &index, inline_flag);
if (parsed_code) {
if (expecting_new_line) {
Token *token = darray_get(tokens, index-1);
Token *token = darray_get(tokens, old_index);
fprintf(stderr, "%s:%zu:%zu error: syntax error\n", file, token->line,
token->column);
exit(EXIT_FAILURE);

View File

@@ -37,6 +37,6 @@ void free_parsed(void *ptr);
void error_if_finished(char *file,DArray *tokens, size_t *index);
void skip_newlines_and_indents(DArray *tokens, size_t *index);
size_t skip_newlines_and_indents(DArray *tokens, size_t *index);
#endif // PARSER_H