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

Fix the intrinsics, add min and max

Browse Source
This commit is contained in:
jakubtomsu
2023-10-25 15:47:18 +02:00
parent eafe57e923
commit f7e0516254
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_builtin.cpp
+37 -9
View File
@@ -2597,7 +2597,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
Type *original_type = operand->type; Type *original_type = operand->type;
Type *type = base_type(operand->type); Type *type = base_type(operand->type);
if (operand->mode == Addressing_Type && is_type_enumerated_array(type)) { if (operand->mode == Addressing_Type && (is_type_enumerated_array(type) || is_type_union(type))) {
// Okay // Okay
} else if (!is_type_ordered(type) || !(is_type_numeric(type) || is_type_string(type))) { } else if (!is_type_ordered(type) || !(is_type_numeric(type) || is_type_string(type))) {
gbString type_str = type_to_string(original_type); gbString type_str = type_to_string(original_type);
@@ -2662,6 +2662,14 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
operand->type = bt->EnumeratedArray.index; operand->type = bt->EnumeratedArray.index;
operand->value = *bt->EnumeratedArray.min_value; operand->value = *bt->EnumeratedArray.min_value;
return true; return true;
} else if (is_type_union(type)) {
Type *bt = base_type(type);
GB_ASSERT(bt->kind == Type_Union);
operand->mode = Addressing_Constant;
operand->type = t_untyped_integer;
i64 min_tag = bt->Union.kind == UnionType_no_nil ? 0 : 1;
operand->value = exact_value_i64(min_tag);
return true;
} }
gbString type_str = type_to_string(original_type); gbString type_str = type_to_string(original_type);
error(call, "Invalid type for 'min', got %s", type_str); error(call, "Invalid type for 'min', got %s", type_str);
@@ -2766,7 +2774,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
Type *original_type = operand->type; Type *original_type = operand->type;
Type *type = base_type(operand->type); Type *type = base_type(operand->type);
if (operand->mode == Addressing_Type && is_type_enumerated_array(type)) { if (operand->mode == Addressing_Type && (is_type_enumerated_array(type) || is_type_union(type))) {
// Okay // Okay
} else if (!is_type_ordered(type) || !(is_type_numeric(type) || is_type_string(type))) { } else if (!is_type_ordered(type) || !(is_type_numeric(type) || is_type_string(type))) {
gbString type_str = type_to_string(original_type); gbString type_str = type_to_string(original_type);
@@ -2836,6 +2844,14 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
operand->type = bt->EnumeratedArray.index; operand->type = bt->EnumeratedArray.index;
operand->value = *bt->EnumeratedArray.max_value; operand->value = *bt->EnumeratedArray.max_value;
return true; return true;
} else if (is_type_union(type)) {
Type *bt = base_type(type);
GB_ASSERT(bt->kind == Type_Union);
operand->mode = Addressing_Constant;
operand->type = t_untyped_integer;
i64 max_tag = (bt->Union.kind == UnionType_no_nil ? 0 : 1) + bt->Union.variants.count - 1;
operand->value = exact_value_i64(max_tag);
return true;
} }
gbString type_str = type_to_string(original_type); gbString type_str = type_to_string(original_type);
error(call, "Invalid type for 'max', got %s", type_str); error(call, "Invalid type for 'max', got %s", type_str);
@@ -5180,7 +5196,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
} }
break; break;
case BuiltinProc_type_variant_type: case BuiltinProc_type_variant_type_of:
{ {
if (operand->mode != Addressing_Type) { if (operand->mode != Addressing_Type) {
error(operand->expr, "Expected a type for '%.*s'", LIT(builtin_name)); error(operand->expr, "Expected a type for '%.*s'", LIT(builtin_name));
@@ -5210,10 +5226,6 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
} }
i64 index = big_int_to_i64(&x.value.value_integer); i64 index = big_int_to_i64(&x.value.value_integer);
if (u->Union.kind != UnionType_no_nil) {
index -= 1;
}
if (index < 0 || index >= u->Union.variants.count) { if (index < 0 || index >= u->Union.variants.count) {
error(call, "Variant tag out of bounds index for '%.*s", LIT(builtin_name)); error(call, "Variant tag out of bounds index for '%.*s", LIT(builtin_name));
operand->mode = Addressing_Type; operand->mode = Addressing_Type;
@@ -5226,7 +5238,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
} }
break; break;
case BuiltinProc_type_variant_tag: case BuiltinProc_type_variant_index_of:
{ {
if (operand->mode != Addressing_Type) { if (operand->mode != Addressing_Type) {
error(operand->expr, "Expected a type for '%.*s'", LIT(builtin_name)); error(operand->expr, "Expected a type for '%.*s'", LIT(builtin_name));
@@ -5248,9 +5260,25 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
u = base_type(u); u = base_type(u);
GB_ASSERT(u->kind == Type_Union); GB_ASSERT(u->kind == Type_Union);
i64 index = -1;
for_array(i, u->Union.variants) {
Type *vt = u->Union.variants[i];
if (union_variant_index_types_equal(v, vt)) {
index = i64(i);
break;
}
}
if (index < 0) {
error(operand->expr, "Expected a variant type for '%.*s'", LIT(builtin_name));
operand->mode = Addressing_Invalid;
operand->type = t_invalid;
return false;
}
operand->mode = Addressing_Constant; operand->mode = Addressing_Constant;
operand->type = t_untyped_integer; operand->type = t_untyped_integer;
operand->value = exact_value_i64(union_variant_index(u, v)); operand->value = exact_value_i64(index);
} }
break; break;