diff options
| author | Bruce Hill <bruce@bruce-hill.com> | 2024-06-18 01:32:44 -0400 |
|---|---|---|
| committer | Bruce Hill <bruce@bruce-hill.com> | 2024-06-18 01:32:44 -0400 |
| commit | ed935eb882593540e827f8a18c384bf4ab54a653 (patch) | |
| tree | 968cb8bdc01104ea440728a3928ccfe10abbdc5d | |
| parent | f5dc37c86cac80b2e5da110da33ad98dc548381d (diff) | |
Fix array_lvalue
| -rw-r--r-- | builtins/array.h | 4 | ||||
| -rw-r--r-- | test/arrays.tm | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtins/array.h b/builtins/array.h index a2e76f18..3f4bfe7e 100644 --- a/builtins/array.h +++ b/builtins/array.h @@ -17,14 +17,14 @@ if (__builtin_expect(off < 0 || off >= arr.length, 0)) \ fail_source(filename, start, end, "Invalid array index: %r (array has length %ld)\n", Int$as_text(&index, USE_COLOR, NULL), arr.length); \ (item_type*)(arr.data + arr.stride * off);}) -#define Array_lvalue(item_type, arr_expr, index_expr, typeinfo, filename, start, end) { \ +#define Array_lvalue(item_type, arr_expr, index_expr, typeinfo, filename, start, end) *({ \ array_t *arr = arr_expr; int64_t index = (int64_t)(index_expr); \ int64_t off = index + (index < 0) * (arr->length + 1) - 1; \ if (__builtin_expect(off < 0 || off >= arr->length, 0)) \ fail_source(filename, start, end, "Invalid array index: %r (array has length %ld)\n", Int$as_text(&index, USE_COLOR, NULL), arr->length); \ if (arr->data_refcount > 0) \ Array$compact(arr, typeinfo); \ - *(item_type*)(arr->data + arr->stride * off); } + (item_type*)(arr->data + arr->stride * off); }) #define Array_set(item_type, arr, index, value, typeinfo, filename, start, end) \ Array_lvalue(item_type, arr_expr, index, typeinfo, filename, start, end) = value #define Array_get_unchecked(type, x, i) *({ const array_t arr = x; int64_t index = (int64_t)(i); \ diff --git a/test/arrays.tm b/test/arrays.tm index 16721c7d..b609aa9b 100644 --- a/test/arrays.tm +++ b/test/arrays.tm @@ -71,6 +71,7 @@ func main(): = [10, 20] >> arr[1] = 999 + >> arr = @[999, 20, 30] do: |