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 ternary logic for untyped nil stuff

Browse Source
This commit is contained in:
gingerBill
2023-01-30 15:29:59 +00:00
parent 8e8eb9e5cd
commit f59846377d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+5 -3
View File
@@ -7518,11 +7518,13 @@ gb_internal ExprKind check_ternary_if_expr(CheckerContext *c, Operand *o, Ast *n
return kind; return kind;
} }
convert_to_typed(c, &x, type_hint ? type_hint : y.type); bool use_type_hint = type_hint != nullptr && (is_operand_nil(x) || is_operand_nil(y));
convert_to_typed(c, &x, use_type_hint ? type_hint : y.type);
if (x.mode == Addressing_Invalid) { if (x.mode == Addressing_Invalid) {
return kind; return kind;
} }
convert_to_typed(c, &y, type_hint ? type_hint : x.type); convert_to_typed(c, &y, use_type_hint ? type_hint : x.type);
if (y.mode == Addressing_Invalid) { if (y.mode == Addressing_Invalid) {
x.mode = Addressing_Invalid; x.mode = Addressing_Invalid;
return kind; return kind;
@@ -7530,7 +7532,7 @@ gb_internal ExprKind check_ternary_if_expr(CheckerContext *c, Operand *o, Ast *n
// NOTE(bill, 2023-01-30): Allow for expression like this: // NOTE(bill, 2023-01-30): Allow for expression like this:
// x: union{f32} = f32(123) if cond else nil // x: union{f32} = f32(123) if cond else nil
if (type_hint && !ternary_compare_types(x.type, y.type)) { if (type_hint && !is_type_any(type_hint) && !ternary_compare_types(x.type, y.type)) {
if (check_is_assignable_to(c, &x, type_hint) && check_is_assignable_to(c, &y, type_hint)) { if (check_is_assignable_to(c, &x, type_hint) && check_is_assignable_to(c, &y, type_hint)) {
check_cast(c, &x, type_hint); check_cast(c, &x, type_hint);
check_cast(c, &y, type_hint); check_cast(c, &y, type_hint);