Implement indexing

2 files changed, 13 insertions, 2 deletions

diff --git a/builtins/array.h b/builtins/array.h
index 7c83e17d..8884f794 100644
--- a/builtins/array.h
+++ b/builtins/array.h
@@ -8,8 +8,14 @@
 #include "types.h"
 
 // Convert negative indices to back-indexed without branching: index0 = index + (index < 0)*(len+1)) - 1
-#define $index(x, i) _Generic(x, array_t: ({ __typeof(x) $obj; int64_t $offset = i; $offset += ($offset < 0) * ($obj.length + 1) - 1; assert($offset >= 0 && offset < $obj.length); $obj.data + $obj.stride * $offset;}))
-#define $safe_index(x, i) _Generic(x, array_t: ({ __typeof(x) $obj; int64_t $offset = i - 1; $obj.data + $obj.stride * $offset;}))
+#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)", $index, $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(x, ...) ({ __typeof(x) $items[] = {x, __VA_ARGS__}; \
                          (array_t){.length=sizeof($items)/sizeof($items[0]), \
                          .stride=(int64_t)&$items[1] - (int64_t)&$items[0], \
diff --git a/builtins/table.h b/builtins/table.h
index 13262bbe..3f93da32 100644
--- a/builtins/table.h
+++ b/builtins/table.h
@@ -18,6 +18,11 @@
     $table.fallback = fb; \
     $table.default_value = def; \
     $table; })
+#define $Table_get(table_expr, key_t, val_t, key_expr, info_expr) ({ \
+    const table_t *$t = table_expr; key_t $k = key_expr; const TypeInfo* $info = info_expr; \
+    const val_t *$v = Table_get($t, &$k, $info); \
+    if (__builtin_expect($v == NULL, 0)) fail("The key %r is not in this table", generic_as_str(&$k, no, $info->TableInfo.key)); \
+    *$v; })
 
 
 table_t Table_from_entries(array_t entries, const TypeInfo *type);