diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/check_decl.cpp | 11 | ||||
| -rw-r--r-- | src/check_stmt.cpp | 23 |
2 files changed, 27 insertions, 7 deletions
diff --git a/src/check_decl.cpp b/src/check_decl.cpp index 1a87b57b8..583c4f133 100644 --- a/src/check_decl.cpp +++ b/src/check_decl.cpp @@ -1297,13 +1297,21 @@ void check_proc_body(CheckerContext *ctx_, Token token, DeclInfo *decl, Type *ty error(bs->close, "Missing return statement at the end of the procedure"); } } + } else if (type->Proc.diverging) { + if (!check_is_terminating(body, str_lit(""))) { + if (token.kind == Token_Ident) { + error(bs->close, "Missing diverging call at the end of the procedure '%.*s'", LIT(token.string)); + } else { + // NOTE(bill): Anonymous procedure (lambda) + error(bs->close, "Missing diverging call at the end of the procedure"); + } + } } } check_close_scope(ctx); check_scope_usage(ctx->checker, ctx->scope); -#if 1 if (decl->parent != nullptr) { Scope *ps = decl->parent->scope; if (ps->flags & (ScopeFlag_File & ScopeFlag_Pkg & ScopeFlag_Global)) { @@ -1321,7 +1329,6 @@ void check_proc_body(CheckerContext *ctx_, Token token, DeclInfo *decl, Type *ty } } } -#endif } diff --git a/src/check_stmt.cpp b/src/check_stmt.cpp index 4fdece852..24960b33c 100644 --- a/src/check_stmt.cpp +++ b/src/check_stmt.cpp @@ -247,11 +247,24 @@ bool check_is_terminating(Ast *node, String const &label) { case_ast_node(ws, WhenStmt, node); // TODO(bill): Is this logic correct for when statements? - if (ws->else_stmt != nullptr) { - if (check_is_terminating(ws->body, label) && - check_is_terminating(ws->else_stmt, label)) { - return true; - } + auto const &tv = ws->cond->tav; + if (tv.mode != Addressing_Constant) { + // NOTE(bill): Check the things regardless as a bug occurred earlier + if (ws->else_stmt != nullptr) { + if (check_is_terminating(ws->body, label) && + check_is_terminating(ws->else_stmt, label)) { + return true; + } + } + return false; + } + + if (tv.value.kind == ExactValue_Bool) { + if (tv.value.value_bool) { + return check_is_terminating(ws->body, label); + } else { + return check_is_terminating(ws->else_stmt, label); + } } case_end; |