From f7d403c35849758d68e3a0ca9a9777bfce7da0b7 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sun, 25 Feb 2024 13:04:35 -0500
Subject: WIP on stackrefs

---
 builtins/array.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'builtins/array.h')

diff --git a/builtins/array.h b/builtins/array.h
index 9e74c41d..59245ffe 100644
--- a/builtins/array.h
+++ b/builtins/array.h
@@ -8,15 +8,15 @@
 #include "types.h"
 
 // Convert negative indices to back-indexed without branching: index0 = index + (index < 0)*(len+1)) - 1
-#define $Array_get(type, x, i, filename, start, end) ({ \
-    const array_t *$arr = x; int64_t $index = (int64_t)(i); \
-    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", Int64__as_str(&$index, USE_COLOR, NULL), $arr->length); \
-    *(type*)($arr->data + $arr->stride * $off);})
-#define $Array_get_unchecked(type, x, i) ({ const array_t *$arr = x; int64_t $index = (int64_t)(i); \
-                                          int64_t $off = $index + ($index < 0) * ($arr->length + 1) - 1; \
-                                          *(type*)($arr->data + $arr->stride * $off);})
+#define $Array_get(type, x, i, filename, start, end) *({ \
+    const array_t $arr = x; int64_t $index = (int64_t)(i); \
+    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", Int64__as_str(&$index, USE_COLOR, NULL), $arr.length); \
+    (type*)($arr.data + $arr.stride * $off);})
+#define $Array_get_unchecked(type, x, i) *({ const array_t $arr = x; int64_t $index = (int64_t)(i); \
+                                          int64_t $off = $index + ($index < 0) * ($arr.length + 1) - 1; \
+                                          (type*)($arr.data + $arr.stride * $off);})
 #define $is_atomic(x) _Generic(x, bool: true, int8_t: true, int16_t: true, int32_t: true, int64_t: true, float: true, double: true, default: false)
 #define $Array(x, ...) ({ __typeof(x) $items[] = {x, __VA_ARGS__}; \
                          (array_t){.length=sizeof($items)/sizeof($items[0]), \
-- 
cgit v1.2.3