ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve parsing handling for the { return } cases

Browse Source
This commit is contained in:
gingerBill
2021-08-09 13:01:47 +01:00
parent 042f376626
commit e793f92e67
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+12 -1
View File
@@ -1548,6 +1548,15 @@ void expect_semicolon(AstFile *f, Ast *s) {
expect_semicolon_newline_error(f, f->prev_token, s); expect_semicolon_newline_error(f, f->prev_token, s);
return; return;
} }
switch (f->curr_token.kind) {
case Token_CloseBrace:
case Token_CloseParen:
if (f->curr_token.pos.line == f->prev_token.pos.line) {
return;
}
break;
}
prev_token = f->prev_token; prev_token = f->prev_token;
if (prev_token.kind == Token_Semicolon) { if (prev_token.kind == Token_Semicolon) {
expect_semicolon_newline_error(f, f->prev_token, s); expect_semicolon_newline_error(f, f->prev_token, s);
@@ -1558,6 +1567,8 @@ void expect_semicolon(AstFile *f, Ast *s) {
return; return;
} }
if (s != nullptr) { if (s != nullptr) {
bool insert_semi = (f->tokenizer.flags & TokenizerFlag_InsertSemicolon) != 0; bool insert_semi = (f->tokenizer.flags & TokenizerFlag_InsertSemicolon) != 0;
if (insert_semi) { if (insert_semi) {
@@ -3926,7 +3937,7 @@ Ast *parse_return_stmt(AstFile *f) {
auto results = array_make<Ast *>(heap_allocator()); auto results = array_make<Ast *>(heap_allocator());
while (f->curr_token.kind != Token_Semicolon) { while (f->curr_token.kind != Token_Semicolon && f->curr_token.kind != Token_CloseBrace) {
Ast *arg = parse_expr(f, false); Ast *arg = parse_expr(f, false);
array_add(&results, arg); array_add(&results, arg);
if (f->curr_token.kind != Token_Comma || if (f->curr_token.kind != Token_Comma ||