From 69d41fa068a08fcb468bd50babc43178faf0e114 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Sun, 18 Feb 2024 14:53:52 -0500
Subject: Add source information to runtime errors

---
 builtins/array.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'builtins/array.h')

diff --git a/builtins/array.h b/builtins/array.h
index 84edcb41..65b7028c 100644
--- a/builtins/array.h
+++ b/builtins/array.h
@@ -8,11 +8,12 @@
 #include "types.h"
 
 // Convert negative indices to back-indexed without branching: index0 = index + (index < 0)*(len+1)) - 1
-#define $Array_get(type, x, i) ({ 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("Invalid array index: %ld (array has length %ld)\n", $index, $arr->length); \
-                                *(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);})
-- 
cgit v1.2.3