mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-19 21:10:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2649 from hchac/allow-newline-field-list-separator

Browse Source 
Match C++ parser behavior in allowing newlines before a closing brace.
This commit is contained in:
gingerBill
2023-08-07 11:45:08 +01:00
committed by GitHub
parent 2a42dab108 4c0e9f1f89
commit 488a38a96d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/odin/parser/parser.odin
View File

@@ -420,7 +420,7 @@ expect_closing_brace_of_field_list :: proc(p: ^Parser) -> tokenizer.Token {
if allow_token(p, .Close_Brace) {
return token
}
if allow_token(p, .Semicolon) {
if allow_token(p, .Semicolon) && !tokenizer.is_newline(token) {
str := tokenizer.token_to_string(token)
error(p, end_of_line_pos(p, p.prev_tok), "expected a comma, got %s", str)
}
@@ -1836,7 +1836,9 @@ parse_field_list :: proc(p: ^Parser, follow: tokenizer.Token_Kind, allowed_flags
return true
}
if allow_token(p, .Semicolon) {
error(p, tok.pos, "expected a comma, got a semicolon")
if !tokenizer.is_newline(tok) {
error(p, tok.pos, "expected a comma, got a semicolon")
}
return true
}
return false