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

Minor clean up of is_terminating code

Browse Source 
This does not fix all known issues with it
This commit is contained in:
gingerBill
2024-05-13 12:24:50 +01:00
parent f8d235b6f5
commit 4eab735b13
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_stmt.cpp
+19 -8
View File
@@ -254,6 +254,13 @@ gb_internal bool check_has_break(Ast *stmt, String const &label, bool implicit)
} }
String label_from_node(Ast *node, String default_label) {
if (node != nullptr && node->kind == Ast_Ident) {
return node->Ident.token.string;
}
return default_label;
}
// NOTE(bill): The last expression has to be a 'return' statement // NOTE(bill): The last expression has to be a 'return' statement
// TODO(bill): This is a mild hack and should be probably handled properly // TODO(bill): This is a mild hack and should be probably handled properly
@@ -264,7 +271,7 @@ gb_internal bool check_is_terminating(Ast *node, String const &label) {
case_end; case_end;
case_ast_node(bs, BlockStmt, node); case_ast_node(bs, BlockStmt, node);
return check_is_terminating_list(bs->stmts, label); return check_is_terminating_list(bs->stmts, label_from_node(bs->label, label));
case_end; case_end;
case_ast_node(es, ExprStmt, node); case_ast_node(es, ExprStmt, node);
@@ -285,9 +292,10 @@ gb_internal bool check_is_terminating(Ast *node, String const &label) {
case_end; case_end;
case_ast_node(is, IfStmt, node); case_ast_node(is, IfStmt, node);
String new_label = label_from_node(is->label, label);
if (is->else_stmt != nullptr) { if (is->else_stmt != nullptr) {
if (check_is_terminating(is->body, label) && if (check_is_terminating(is->body, new_label) &&
check_is_terminating(is->else_stmt, label)) { check_is_terminating(is->else_stmt, new_label)) {
return true; return true;
} }
} }
@@ -320,7 +328,8 @@ gb_internal bool check_is_terminating(Ast *node, String const &label) {
case_end; case_end;
case_ast_node(fs, ForStmt, node); case_ast_node(fs, ForStmt, node);
if (fs->cond == nullptr && !check_has_break(fs->body, label, true)) { String new_label = label_from_node(fs->label, label);
if (fs->cond == nullptr && !check_has_break(fs->body, new_label, true)) {
return true; return true;
} }
case_end; case_end;
@@ -335,14 +344,15 @@ gb_internal bool check_is_terminating(Ast *node, String const &label) {
case_ast_node(ss, SwitchStmt, node); case_ast_node(ss, SwitchStmt, node);
bool has_default = false; bool has_default = false;
String new_label = label_from_node(ss->label, label);
for_array(i, ss->body->BlockStmt.stmts) { for_array(i, ss->body->BlockStmt.stmts) {
Ast *clause = ss->body->BlockStmt.stmts[i]; Ast *clause = ss->body->BlockStmt.stmts[i];
ast_node(cc, CaseClause, clause); ast_node(cc, CaseClause, clause);
if (cc->list.count == 0) { if (cc->list.count == 0) {
has_default = true; has_default = true;
} }
if (!check_is_terminating_list(cc->stmts, label) || if (!check_is_terminating_list(cc->stmts, new_label) ||
check_has_break_list(cc->stmts, label, true)) { check_has_break_list(cc->stmts, new_label, true)) {
return false; return false;
} }
} }
@@ -351,14 +361,15 @@ gb_internal bool check_is_terminating(Ast *node, String const &label) {
case_ast_node(ss, TypeSwitchStmt, node); case_ast_node(ss, TypeSwitchStmt, node);
bool has_default = false; bool has_default = false;
String new_label = label_from_node(ss->label, label);
for_array(i, ss->body->BlockStmt.stmts) { for_array(i, ss->body->BlockStmt.stmts) {
Ast *clause = ss->body->BlockStmt.stmts[i]; Ast *clause = ss->body->BlockStmt.stmts[i];
ast_node(cc, CaseClause, clause); ast_node(cc, CaseClause, clause);
if (cc->list.count == 0) { if (cc->list.count == 0) {
has_default = true; has_default = true;
} }
if (!check_is_terminating_list(cc->stmts, label) || if (!check_is_terminating_list(cc->stmts, new_label) ||
check_has_break_list(cc->stmts, label, true)) { check_has_break_list(cc->stmts, new_label, true)) {
return false; return false;
} }
} }