Improve COW/etc handling for update assignments

2 files changed, 5 insertions, 2 deletions

diff --git a/builtins/array.h b/builtins/array.h
index 6375f6d4..df66e636 100644
--- a/builtins/array.h
+++ b/builtins/array.h
@@ -17,14 +17,16 @@
     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_set(item_type, arr_expr, index_expr, value_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) = value_expr; }
+    *(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); \
                                           int64_t $off = $index + ($index < 0) * ($arr.length + 1) - 1; \
                                           (type*)($arr.data + $arr.stride * $off);})
diff --git a/builtins/table.h b/builtins/table.h
index a29fa7cc..ab0004ec 100644
--- a/builtins/table.h
+++ b/builtins/table.h
@@ -48,6 +48,7 @@ void *Table_reserve(table_t *t, const void *key, const void *value, const TypeIn
 void Table_set(table_t *t, const void *key, const void *value, const TypeInfo *type);
 #define Table_set_value(t, key_expr, value_expr, type) ({ __typeof(key_expr) $k = key_expr; __typeof(value_expr) $v = value_expr; \
                                                         Table_set(t, &$k, &$v, type); })
+#define Table_reserve_value(t, key_expr, type) ({ __typeof(key_expr) $k = key_expr; Table_reserve(t, &$k, NULL, type); })
 void Table_remove(table_t *t, const void *key, const TypeInfo *type);
 void Table_clear(table_t *t);
 void Table_mark_copy_on_write(table_t *t);