ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-26 01:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove len,cap,min,max and implement type_union_base_tag_value, type_union_variant_count

Browse Source
This commit is contained in:
jakubtomsu
2023-10-27 11:23:26 +02:00
parent a573d076e4
commit 160b23f991
3 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_builtin.cpp
+55 -24
View File
@@ -1780,11 +1780,6 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
mode = Addressing_Constant;
value = exact_value_i64(bt->SimdVector.count);
type = t_untyped_integer;
} else if (is_type_union(op_type)) {
Type *u = base_type(op_type);
mode = Addressing_Constant;
value = exact_value_i64(u->Union.variants.count);
type = t_untyped_integer;
}
if (operand->mode == Addressing_Type && mode != Addressing_Constant) {
mode = Addressing_Invalid;
@@ -2597,7 +2592,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
Type *original_type = operand->type;
Type *type = base_type(operand->type);
if (operand->mode == Addressing_Type && (is_type_enumerated_array(type) || is_type_union(type))) {
if (operand->mode == Addressing_Type && is_type_enumerated_array(type)) {
// Okay
} else if (!is_type_ordered(type) || !(is_type_numeric(type) || is_type_string(type))) {
gbString type_str = type_to_string(original_type);
@@ -2662,14 +2657,6 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
operand->type = bt->EnumeratedArray.index;
operand->value = *bt->EnumeratedArray.min_value;
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);
error(call, "Invalid type for 'min', got %s", type_str);
@@ -2774,7 +2761,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
Type *original_type = operand->type;
Type *type = base_type(operand->type);
if (operand->mode == Addressing_Type && (is_type_enumerated_array(type) || is_type_union(type))) {
if (operand->mode == Addressing_Type && is_type_enumerated_array(type)) {
// Okay
} else if (!is_type_ordered(type) || !(is_type_numeric(type) || is_type_string(type))) {
gbString type_str = type_to_string(original_type);
@@ -2844,14 +2831,6 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
operand->type = bt->EnumeratedArray.index;
operand->value = *bt->EnumeratedArray.max_value;
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);
error(call, "Invalid type for 'max', got %s", type_str);
@@ -5163,7 +5142,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
operand->type = union_tag_type(u);
}
break;
case BuiltinProc_type_union_tag_offset:
{
if (operand->mode != Addressing_Type) {
@@ -5196,6 +5175,58 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
}
break;
case BuiltinProc_type_union_base_tag_value:
{
if (operand->mode != Addressing_Type) {
error(operand->expr, "Expected a type for '%.*s'", LIT(builtin_name));
operand->mode = Addressing_Invalid;
operand->type = t_invalid;
return false;
}
Type *u = operand->type;
if (!is_type_union(u)) {
error(operand->expr, "Expected a union type for '%.*s'", LIT(builtin_name));
operand->mode = Addressing_Invalid;
operand->type = t_invalid;
return false;
}
u = base_type(u);
GB_ASSERT(u->kind == Type_Union);
operand->mode = Addressing_Constant;
operand->type = t_untyped_integer;
operand->value = exact_value_i64(u->Union.kind == UnionType_no_nil ? 0 : 1);
} break;
case BuiltinProc_type_union_variant_count:
{
if (operand->mode != Addressing_Type) {
error(operand->expr, "Expected a type for '%.*s'", LIT(builtin_name));
operand->mode = Addressing_Invalid;
operand->type = t_invalid;
return false;
}
Type *u = operand->type;
if (!is_type_union(u)) {
error(operand->expr, "Expected a union type for '%.*s'", LIT(builtin_name));
operand->mode = Addressing_Invalid;
operand->type = t_invalid;
return false;
}
u = base_type(u);
GB_ASSERT(u->kind == Type_Union);
operand->mode = Addressing_Constant;
operand->type = t_untyped_integer;
operand->value = exact_value_i64(u->Union.variants.count);
} break;
case BuiltinProc_type_variant_type_of:
{
if (operand->mode != Addressing_Type) {