diff options
| author | jakubtomsu <66876057+jakubtomsu@users.noreply.github.com> | 2023-10-01 13:09:08 +0200 |
|---|---|---|
| committer | jakubtomsu <66876057+jakubtomsu@users.noreply.github.com> | 2023-10-01 13:09:08 +0200 |
| commit | 1a57ad233d06e52e486f717ddea1ce15934657eb (patch) | |
| tree | d45923b45bf5b639d34fa946df55ac6dda7d46fa | |
| parent | c2684634132c0af6f2bd042280fcf667576fceb5 (diff) | |
Fix field count in enumerated array type info
| -rw-r--r-- | src/check_type.cpp | 2 | ||||
| -rw-r--r-- | src/types.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/check_type.cpp b/src/check_type.cpp index 3360df040..ee12b90ca 100644 --- a/src/check_type.cpp +++ b/src/check_type.cpp @@ -2797,7 +2797,7 @@ gb_internal bool check_type_internal(CheckerContext *ctx, Ast *e, Type **type, T Type *bt = base_type(index); GB_ASSERT(bt->kind == Type_Enum); - Type *t = alloc_type_enumerated_array(elem, index, bt->Enum.min_value, bt->Enum.max_value, Token_Invalid); + Type *t = alloc_type_enumerated_array(elem, index, bt->Enum.min_value, bt->Enum.max_value, bt->Enum.fields.count, Token_Invalid); bool is_sparse = false; if (at->tag != nullptr) { diff --git a/src/types.cpp b/src/types.cpp index f3062365f..574e628c5 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -983,7 +983,7 @@ gb_internal Type *alloc_type_matrix(Type *elem, i64 row_count, i64 column_count, } -gb_internal Type *alloc_type_enumerated_array(Type *elem, Type *index, ExactValue const *min_value, ExactValue const *max_value, TokenKind op) { +gb_internal Type *alloc_type_enumerated_array(Type *elem, Type *index, ExactValue const *min_value, ExactValue const *max_value, isize count, TokenKind op) { Type *t = alloc_type(Type_EnumeratedArray); t->EnumeratedArray.elem = elem; t->EnumeratedArray.index = index; @@ -993,7 +993,11 @@ gb_internal Type *alloc_type_enumerated_array(Type *elem, Type *index, ExactValu gb_memmove(t->EnumeratedArray.max_value, max_value, gb_size_of(ExactValue)); t->EnumeratedArray.op = op; - t->EnumeratedArray.count = 1 + exact_value_to_i64(exact_value_sub(*max_value, *min_value)); + if (count == 0) { + t->EnumeratedArray.count = 0; + } else { + t->EnumeratedArray.count = 1 + exact_value_to_i64(exact_value_sub(*max_value, *min_value)); + } return t; } |