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

Improve -strict-style rules for if-else statements

Browse Source
This commit is contained in:
gingerBill
2024-06-29 20:04:34 +01:00
parent b1a1da6618
commit 34fce83d66
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+12 -4
View File
@@ -1486,7 +1486,7 @@ gb_internal bool skip_possible_newline(AstFile *f) {
return false; return false;
} }
gb_internal bool skip_possible_newline_for_literal(AstFile *f, bool seen_where=false) { gb_internal bool skip_possible_newline_for_literal(AstFile *f, bool ignore_strict_style=false) {
Token curr = f->curr_token; Token curr = f->curr_token;
if (token_is_newline(curr)) { if (token_is_newline(curr)) {
Token next = peek_token(f); Token next = peek_token(f);
@@ -1494,7 +1494,7 @@ gb_internal bool skip_possible_newline_for_literal(AstFile *f, bool seen_where=f
switch (next.kind) { switch (next.kind) {
case Token_OpenBrace: case Token_OpenBrace:
case Token_else: case Token_else:
if (build_context.strict_style && !seen_where) { if (build_context.strict_style && !ignore_strict_style) {
syntax_error(next, "With '-strict-style' the attached brace style (1TBS) is enforced"); syntax_error(next, "With '-strict-style' the attached brace style (1TBS) is enforced");
} }
/*fallthrough*/ /*fallthrough*/
@@ -4548,7 +4548,11 @@ gb_internal Ast *parse_if_stmt(AstFile *f) {
body = parse_block_stmt(f, false); body = parse_block_stmt(f, false);
} }
skip_possible_newline_for_literal(f); bool ignore_strict_style = false;
if (token.pos.line == ast_end_token(body).pos.line) {
ignore_strict_style = true;
}
skip_possible_newline_for_literal(f, ignore_strict_style);
if (f->curr_token.kind == Token_else) { if (f->curr_token.kind == Token_else) {
Token else_token = expect_token(f, Token_else); Token else_token = expect_token(f, Token_else);
switch (f->curr_token.kind) { switch (f->curr_token.kind) {
@@ -4600,7 +4604,11 @@ gb_internal Ast *parse_when_stmt(AstFile *f) {
body = parse_block_stmt(f, true); body = parse_block_stmt(f, true);
} }
skip_possible_newline_for_literal(f); bool ignore_strict_style = false;
if (token.pos.line == ast_end_token(body).pos.line) {
ignore_strict_style = true;
}
skip_possible_newline_for_literal(f, ignore_strict_style);
if (f->curr_token.kind == Token_else) { if (f->curr_token.kind == Token_else) {
Token else_token = expect_token(f, Token_else); Token else_token = expect_token(f, Token_else);
switch (f->curr_token.kind) { switch (f->curr_token.kind) {