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

Add extra check for #no_bounds_check etc being followed by a newline or empty statement

Browse Source
This commit is contained in:
gingerBill
2021-05-01 17:59:30 +01:00
parent 406d2ab6ba
commit ced7700cdb
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+15 -16
View File
@@ -4341,6 +4341,16 @@ Ast *parse_unrolled_for_loop(AstFile *f, Token unroll_token) {
return ast_unroll_range_stmt(f, unroll_token, for_token, val0, val1, in_token, expr, body); return ast_unroll_range_stmt(f, unroll_token, for_token, val0, val1, in_token, expr, body);
} }
void parse_check_directive_for_empty_statement(Ast *s, Token const &name) {
if (s != nullptr && s->kind == Ast_EmptyStmt) {
if (s->EmptyStmt.token.string == "\n") {
syntax_error(name, "#%.*s cannot be followed by a newline", LIT(name.string));
} else {
syntax_error(name, "#%.*s cannot be applied to an empty statement ';'", LIT(name.string));
}
}
}
Ast *parse_stmt(AstFile *f) { Ast *parse_stmt(AstFile *f) {
Ast *s = nullptr; Ast *s = nullptr;
Token token = f->curr_token; Token token = f->curr_token;
@@ -4447,6 +4457,7 @@ Ast *parse_stmt(AstFile *f) {
if (tag == "bounds_check") { if (tag == "bounds_check") {
s = parse_stmt(f); s = parse_stmt(f);
parse_check_directive_for_empty_statement(s, name);
s->state_flags |= StateFlag_bounds_check; s->state_flags |= StateFlag_bounds_check;
if ((s->state_flags & StateFlag_no_bounds_check) != 0) { if ((s->state_flags & StateFlag_no_bounds_check) != 0) {
syntax_error(token, "#bounds_check and #no_bounds_check cannot be applied together"); syntax_error(token, "#bounds_check and #no_bounds_check cannot be applied together");
@@ -4454,27 +4465,12 @@ Ast *parse_stmt(AstFile *f) {
return s; return s;
} else if (tag == "no_bounds_check") { } else if (tag == "no_bounds_check") {
s = parse_stmt(f); s = parse_stmt(f);
parse_check_directive_for_empty_statement(s, name);
s->state_flags |= StateFlag_no_bounds_check; s->state_flags |= StateFlag_no_bounds_check;
if ((s->state_flags & StateFlag_bounds_check) != 0) { if ((s->state_flags & StateFlag_bounds_check) != 0) {
syntax_error(token, "#bounds_check and #no_bounds_check cannot be applied together"); syntax_error(token, "#bounds_check and #no_bounds_check cannot be applied together");
} }
return s; return s;
} else if (tag == "complete") {
s = parse_stmt(f);
switch (s->kind) {
case Ast_SwitchStmt:
s->SwitchStmt.partial = false;
syntax_warning(token, "#complete is now the default and has been replaced with its opposite: #partial");
break;
case Ast_TypeSwitchStmt:
s->TypeSwitchStmt.partial = false;
syntax_warning(token, "#complete is now the default and has been replaced with its opposite: #partial");
break;
default:
syntax_error(token, "#complete can only be applied to a switch statement");
break;
}
return s;
} else if (tag == "partial") { } else if (tag == "partial") {
s = parse_stmt(f); s = parse_stmt(f);
switch (s->kind) { switch (s->kind) {
@@ -4484,6 +4480,9 @@ Ast *parse_stmt(AstFile *f) {
case Ast_TypeSwitchStmt: case Ast_TypeSwitchStmt:
s->TypeSwitchStmt.partial = true; s->TypeSwitchStmt.partial = true;
break; break;
case Ast_EmptyStmt:
parse_check_directive_for_empty_statement(s, name);
break;
default: default:
syntax_error(token, "#partial can only be applied to a switch statement"); syntax_error(token, "#partial can only be applied to a switch statement");
break; break;