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

Merge pull request #1331 from DanielGavin/parser-fault-recovery

Browse Source 
Recover from closing brace not found in field list
This commit is contained in:
gingerBill
2022-02-15 16:26:16 +00:00
committed by GitHub
parent 21864d8d51 a4ba91a554
commit edc13c29df
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/odin/parser/parser.odin
+13 -1
View File
@@ -428,9 +428,21 @@ expect_closing_brace_of_field_list :: proc(p: ^Parser) -> tokenizer.Token {
str := tokenizer.token_to_string(token) str := tokenizer.token_to_string(token)
error(p, end_of_line_pos(p, p.prev_tok), "expected a comma, got %s", str) error(p, end_of_line_pos(p, p.prev_tok), "expected a comma, got %s", str)
} }
return expect_token(p, .Close_Brace) expect_brace := expect_token(p, .Close_Brace)
if expect_brace.kind != .Close_Brace {
for p.curr_tok.kind != .Close_Brace && p.curr_tok.kind != .EOF && !is_non_inserted_semicolon(p.curr_tok) {
advance_token(p)
}
return p.curr_tok
}
return expect_brace
} }
is_non_inserted_semicolon :: proc(tok: tokenizer.Token) -> bool {
return tok.kind == .Semicolon && tok.text != "\n"
}
is_blank_ident :: proc{ is_blank_ident :: proc{
is_blank_ident_string, is_blank_ident_string,