aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Rijn <Kelimion@users.noreply.github.com>2025-10-11 15:35:58 +0200
committerGitHub <noreply@github.com>2025-10-11 15:35:58 +0200
commitd1d8df34116a53c7bb2d2fa1cfc10cfe0f73663b (patch)
treeed86f1ee108b07d74746543d4a784f578e66104b
parent767098257eb5a6b4bc388ff3d21217f99292fbb9 (diff)
parente6754547aba1df61af2fc302a100762c09fe215f (diff)
Merge pull request #5793 from Kelimion/checker-bugs
Checker bugs
-rw-r--r--src/exact_value.cpp4
-rw-r--r--src/types.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/exact_value.cpp b/src/exact_value.cpp
index f2aed84c2..e7077bd5b 100644
--- a/src/exact_value.cpp
+++ b/src/exact_value.cpp
@@ -908,8 +908,8 @@ gb_internal ExactValue exact_binary_operator_value(TokenKind op, ExactValue x, E
if (op != Token_Add) goto error;
// NOTE(bill): How do you minimize this over allocation?
- String sx = x.value_string;
- String sy = y.value_string;
+ String16 sx = x.value_string16;
+ String16 sy = y.value_string16;
isize len = sx.len+sy.len;
u16 *data = gb_alloc_array(permanent_allocator(), u16, len);
gb_memmove(data, sx.text, sx.len*gb_size_of(u16));
diff --git a/src/types.cpp b/src/types.cpp
index 372c2e991..66c87a25d 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -410,7 +410,7 @@ gb_internal u32 type_info_flags_of_type(Type *type) {
flags |= TypeInfoFlag_Comparable;
}
if (is_type_simple_compare(type)) {
- flags |= TypeInfoFlag_Comparable;
+ flags |= TypeInfoFlag_Simple_Compare;
}
return flags;
}
@@ -1725,7 +1725,7 @@ gb_internal bool is_type_u8_ptr(Type *t) {
t = base_type(t);
if (t == nullptr) { return false; }
if (t->kind == Type_Pointer) {
- return is_type_u8(t->Slice.elem);
+ return is_type_u8(t->Pointer.elem);
}
return false;
}
@@ -1766,7 +1766,7 @@ gb_internal bool is_type_u16_ptr(Type *t) {
t = base_type(t);
if (t == nullptr) { return false; }
if (t->kind == Type_Pointer) {
- return is_type_u16(t->Slice.elem);
+ return is_type_u16(t->Pointer.elem);
}
return false;
}