diff options
| author | jakubtomsu <66876057+jakubtomsu@users.noreply.github.com> | 2023-10-24 22:15:33 +0200 |
|---|---|---|
| committer | jakubtomsu <66876057+jakubtomsu@users.noreply.github.com> | 2023-10-24 22:15:33 +0200 |
| commit | c76ab138eb574f271dff7b029ee8df2a1a6c7481 (patch) | |
| tree | d7b5e58f3dc893d22214572fbc086bde964189e9 | |
| parent | 16c176dc89ee4557a3e86803434de6d5f07d55f4 (diff) | |
Naming, use variant index instead of tag
| -rw-r--r-- | core/intrinsics/intrinsics.odin | 5 | ||||
| -rw-r--r-- | src/checker_builtin_procs.hpp | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index 33c4e2b07..505309a8e 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -162,7 +162,12 @@ type_is_matrix :: proc($T: typeid) -> bool --- type_has_nil :: proc($T: typeid) -> bool --- type_is_specialization_of :: proc($T, $S: typeid) -> bool --- + type_is_variant_of :: proc($U, $V: typeid) -> bool where type_is_union(U) --- +type_union_tag :: proc($U: typeid) -> typeid where type_is_union(U) --- +type_union_tag_offset :: proc($U: typeid) -> int where type_is_union(U) --- +type_variant_type_of_of :: proc($U: typeid, $index: int) -> typeid where type_is_union(U) --- +type_variant_index_of :: proc($U, $V: typeid) -> int where type_is_union(U) --- type_has_field :: proc($T: typeid, $name: string) -> bool --- type_field_type :: proc($T: typeid, $name: string) -> typeid --- diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index c5d10955b..8053d54f2 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -262,8 +262,8 @@ BuiltinProc__type_simple_boolean_end, BuiltinProc_type_is_variant_of, BuiltinProc_type_union_tag, BuiltinProc_type_union_tag_offset, - BuiltinProc_type_variant_type, - BuiltinProc_type_variant_tag, + BuiltinProc_type_variant_type_of, + BuiltinProc_type_variant_index_of, BuiltinProc_type_struct_field_count, @@ -564,8 +564,8 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT("type_is_variant_of"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_union_tag"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_union_tag_offset"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("type_variant_type"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("type_variant_tag"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("type_variant_type_of"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("type_variant_index_of"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("type_struct_field_count"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, |