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

Allow casting between matrix types of different element types

Browse Source
This commit is contained in:
gingerBill
2021-11-04 16:50:59 +00:00
parent bc2bf1caeb
commit 68046d0c08
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+6 -8
View File
@@ -659,8 +659,8 @@ i64 check_distance_between_types(CheckerContext *c, Operand *operand, Type *type
} }
if (is_type_matrix(dst)) { if (is_type_matrix(dst)) {
Type *elem = base_array_type(dst); Type *dst_elem = base_array_type(dst);
i64 distance = check_distance_between_types(c, operand, elem); i64 distance = check_distance_between_types(c, operand, dst_elem);
if (distance >= 0) { if (distance >= 0) {
return distance + 7; return distance + 7;
} }
@@ -2467,7 +2467,9 @@ bool check_is_castable_to(CheckerContext *c, Operand *operand, Type *y) {
if (is_type_matrix(src) && is_type_matrix(dst)) { if (is_type_matrix(src) && is_type_matrix(dst)) {
GB_ASSERT(src->kind == Type_Matrix); GB_ASSERT(src->kind == Type_Matrix);
GB_ASSERT(dst->kind == Type_Matrix); GB_ASSERT(dst->kind == Type_Matrix);
if (!are_types_identical(src->Matrix.elem, dst->Matrix.elem)) { Operand op = *operand;
op.type = src->Matrix.elem;
if (!check_is_castable_to(c, &op, dst->Matrix.elem)) {
return false; return false;
} }
@@ -2477,11 +2479,7 @@ bool check_is_castable_to(CheckerContext *c, Operand *operand, Type *y) {
return src_count == dst_count; return src_count == dst_count;
} }
if (dst->Matrix.row_count != dst->Matrix.column_count) { return is_matrix_square(dst) && is_matrix_square(src);
return false;
}
return true;
} }