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

Improve error handling for #5506

Browse Source
This commit is contained in:
gingerBill
2025-11-02 15:27:33 +00:00
parent 2d5b431b85
commit d8f26720bb
1 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+48 -2
View File
@@ -9200,6 +9200,52 @@ gb_internal ExprKind check_basic_directive_expr(CheckerContext *c, Operand *o, A
return kind; return kind;
} }
gb_internal void check_expr_as_value_for_ternary(CheckerContext *c, Operand *o, Ast *e, Type *type_hint) {
check_expr_base(c, o, e, type_hint);
check_not_tuple(c, o);
error_operand_no_value(o);
switch (o->mode) {
case Addressing_Type: {
ERROR_BLOCK();
gbString expr_str = expr_to_string(o->expr);
defer (gb_string_free(expr_str));
error(o->expr, "A type '%s' cannot be used as a runtime value", expr_str);
error_line("\tSuggestion: If a runtime 'typeid' is wanted, use 'typeid_of' to convert a type\n");
o->mode = Addressing_Invalid;
} break;
case Addressing_Builtin: {
ERROR_BLOCK();
gbString expr_str = expr_to_string(o->expr);
defer (gb_string_free(expr_str));
error(o->expr, "A built-in procedure '%s' cannot be used as a runtime value", expr_str);
error_line("\tNote: Built-in procedures are implemented by the compiler and might not be actually instantiated procedures\n");
o->mode = Addressing_Invalid;
} break;
case Addressing_ProcGroup: {
ERROR_BLOCK();
gbString expr_str = expr_to_string(o->expr);
defer (gb_string_free(expr_str));
error(o->expr, "Cannot use overloaded procedure '%s' as a runtime value", expr_str);
error_line("\tNote: Please specify which procedure in the procedure group to use, via cast or type inference\n");
o->mode = Addressing_Invalid;
} break;
}
}
gb_internal ExprKind check_ternary_if_expr(CheckerContext *c, Operand *o, Ast *node, Type *type_hint) { gb_internal ExprKind check_ternary_if_expr(CheckerContext *c, Operand *o, Ast *node, Type *type_hint) {
ExprKind kind = Expr_Expr; ExprKind kind = Expr_Expr;
Operand cond = {Addressing_Invalid}; Operand cond = {Addressing_Invalid};
@@ -9213,7 +9259,7 @@ gb_internal ExprKind check_ternary_if_expr(CheckerContext *c, Operand *o, Ast *n
Operand x = {Addressing_Invalid}; Operand x = {Addressing_Invalid};
Operand y = {Addressing_Invalid}; Operand y = {Addressing_Invalid};
check_expr_or_type(c, &x, te->x, type_hint); check_expr_as_value_for_ternary(c, &x, te->x, type_hint);
node->viral_state_flags |= te->x->viral_state_flags; node->viral_state_flags |= te->x->viral_state_flags;
if (te->y != nullptr) { if (te->y != nullptr) {
@@ -9221,7 +9267,7 @@ gb_internal ExprKind check_ternary_if_expr(CheckerContext *c, Operand *o, Ast *n
if (type_hint == nullptr && is_type_typed(x.type)) { if (type_hint == nullptr && is_type_typed(x.type)) {
th = x.type; th = x.type;
} }
check_expr_or_type(c, &y, te->y, th); check_expr_as_value_for_ternary(c, &y, te->y, th);
node->viral_state_flags |= te->y->viral_state_flags; node->viral_state_flags |= te->y->viral_state_flags;
} else { } else {
error(node, "A ternary expression must have an else clause"); error(node, "A ternary expression must have an else clause");