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

odin/parser: Fix parsing of struct literal/call expression when closing brace/paren is on a new line without a comma after the last argument.

Browse Source
This commit is contained in:
Rikard Petré
2024-01-20 15:57:14 +01:00
parent 5a542c7ad5
commit 144504a752
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/odin/parser/parser.odin
+11 -7
View File
@@ -416,24 +416,28 @@ end_of_line_pos :: proc(p: ^Parser, tok: tokenizer.Token) -> tokenizer.Pos {
} }
expect_closing_brace_of_field_list :: proc(p: ^Parser) -> tokenizer.Token { expect_closing_brace_of_field_list :: proc(p: ^Parser) -> tokenizer.Token {
return expect_closing_token_of_field_list(p, .Close_Brace, "field list")
}
expect_closing_token_of_field_list :: proc(p: ^Parser, closing_kind: tokenizer.Token_Kind, msg: string) -> tokenizer.Token {
token := p.curr_tok token := p.curr_tok
if allow_token(p, .Close_Brace) { if allow_token(p, closing_kind) {
return token return token
} }
if allow_token(p, .Semicolon) && !tokenizer.is_newline(token) { if allow_token(p, .Semicolon) && !tokenizer.is_newline(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)
} }
expect_brace := expect_token(p, .Close_Brace) expect_closing := expect_token_after(p, closing_kind, msg)
if expect_brace.kind != .Close_Brace { if expect_closing.kind != closing_kind {
for p.curr_tok.kind != .Close_Brace && p.curr_tok.kind != .EOF && !is_non_inserted_semicolon(p.curr_tok) { for p.curr_tok.kind != closing_kind && p.curr_tok.kind != .EOF && !is_non_inserted_semicolon(p.curr_tok) {
advance_token(p) advance_token(p)
} }
return p.curr_tok return p.curr_tok
} }
return expect_brace return expect_closing
} }
is_non_inserted_semicolon :: proc(tok: tokenizer.Token) -> bool { is_non_inserted_semicolon :: proc(tok: tokenizer.Token) -> bool {
@@ -2922,7 +2926,7 @@ parse_literal_value :: proc(p: ^Parser, type: ^ast.Expr) -> ^ast.Comp_Lit {
} }
p.expr_level -= 1 p.expr_level -= 1
close := expect_token_after(p, .Close_Brace, "compound literal") close := expect_closing_brace_of_field_list(p);
pos := type.pos if type != nil else open.pos pos := type.pos if type != nil else open.pos
lit := ast.new(ast.Comp_Lit, pos, end_pos(close)) lit := ast.new(ast.Comp_Lit, pos, end_pos(close))
@@ -2985,7 +2989,7 @@ parse_call_expr :: proc(p: ^Parser, operand: ^ast.Expr) -> ^ast.Expr {
allow_token(p, .Comma) or_break allow_token(p, .Comma) or_break
} }
close := expect_token_after(p, .Close_Paren, "argument list") close := expect_closing_token_of_field_list(p, .Close_Paren, "argument list")
p.expr_level -= 1 p.expr_level -= 1
ce := ast.new(ast.Call_Expr, operand.pos, end_pos(close)) ce := ast.new(ast.Call_Expr, operand.pos, end_pos(close))