ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-29 02:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-pointers

Browse Source
This commit is contained in:
gingerBill
2021-08-22 11:28:44 +01:00
parent d72f4a8a79 93b5befe45
commit 0decdaed1a
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/odin/parser/parser.odin
+18 -6
View File
@@ -848,12 +848,24 @@ parse_for_stmt :: proc(p: ^Parser) -> ^ast.Stmt {
if !is_range && parse_control_statement_semicolon_separator(p) {
init = cond;
cond = nil;
if p.curr_tok.kind != .Semicolon {
cond = parse_simple_stmt(p, nil);
}
expect_semicolon(p, cond);
if p.curr_tok.kind != .Open_Brace && p.curr_tok.kind != .Do {
post = parse_simple_stmt(p, nil);
if f.curr_tok.kind == .Open_Brace || f.curr_tok.kind == .Do {
error(p, f.curr_tok.pos, "Expected ';', followed by a condition expression and post statement, got %s", token.tokens[f.curr_tok.kind]);
} else {
if p.curr_tok.kind != .Semicolon {
cond = parse_simple_stmt(p, nil);
}
if p.curr_tok.text != ";" {
error(p, p.curr_tok.pos, "Expected ';', got %s", tokenizer.token_to_string(p.curr_tok));
} else {
expect_semicolon(p, nil);
}
if p.curr_tok.kind != .Open_Brace && p.curr_tok.kind != .Do {
post = parse_simple_stmt(p, nil);
}
}
}
}