Invert escaping so user symbols get prepended with "$" and builtin

symbols don't

1 files changed, 35 insertions, 35 deletions

diff --git a/builtins/array.h b/builtins/array.h
index 18757850..711b89c4 100644
--- a/builtins/array.h
+++ b/builtins/array.h
@@ -11,48 +11,48 @@
 #include "types.h"
 
 // Convert negative indices to back-indexed without branching: index0 = index + (index < 0)*(len+1)) - 1
-#define $Array_get(item_type, arr_expr, index_expr, filename, start, end) *({ \
-    const 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); \
-    (item_type*)($arr.data + $arr.stride * $off);})
-#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); }
-#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);})
-#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 $TypedArray(t, ...) ({ t $items[] = {__VA_ARGS__}; \
-                         (array_t){.length=sizeof($items)/sizeof($items[0]), \
-                         .stride=(int64_t)&$items[1] - (int64_t)&$items[0], \
-                         .data=memcpy(GC_MALLOC(sizeof($items)), $items, sizeof($items)), \
+#define Array_get(item_type, arr_expr, index_expr, filename, start, end) *({ \
+    const 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); \
+    (item_type*)(arr.data + arr.stride * off);})
+#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); }
+#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);})
+#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 TypedArray(t, ...) ({ t items[] = {__VA_ARGS__}; \
+                         (array_t){.length=sizeof(items)/sizeof(items[0]), \
+                         .stride=(int64_t)&items[1] - (int64_t)&items[0], \
+                         .data=memcpy(GC_MALLOC(sizeof(items)), items, sizeof(items)), \
                          .atomic=0, \
                          .data_refcount=1}; })
-#define $TypedArrayN(t, N, ...) ({ t $items[N] = {__VA_ARGS__}; \
+#define TypedArrayN(t, N, ...) ({ t items[N] = {__VA_ARGS__}; \
                          (array_t){.length=N, \
-                         .stride=(int64_t)&$items[1] - (int64_t)&$items[0], \
-                         .data=memcpy(GC_MALLOC(sizeof($items)), $items, sizeof($items)), \
+                         .stride=(int64_t)&items[1] - (int64_t)&items[0], \
+                         .data=memcpy(GC_MALLOC(sizeof(items)), items, sizeof(items)), \
                          .atomic=0, \
                          .data_refcount=1}; })
-#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], \
-                         .data=memcpy($is_atomic(x) ? GC_MALLOC_ATOMIC(sizeof($items)) : GC_MALLOC(sizeof($items)), $items,  sizeof($items)), \
-                         .atomic=$is_atomic(x), \
+#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], \
+                         .data=memcpy(is_atomic(x) ? GC_MALLOC_ATOMIC(sizeof(items)) : GC_MALLOC(sizeof(items)), items, sizeof(items)), \
+                         .atomic=is_atomic(x), \
                          .data_refcount=1}; })
-#define $ARRAY_INCREF(arr) (arr).data_refcount |= ((arr).data_refcount << 1) | 1
-#define $ARRAY_DECREF(arr) (arr).data_refcount &= 2
+#define ARRAY_INCREF(arr) (arr).data_refcount |= ((arr).data_refcount << 1) | 1
+#define ARRAY_DECREF(arr) (arr).data_refcount &= 2
 
-#define Array$insert_value(arr, item_expr, index, type) ({ __typeof(item_expr) $item = item_expr; Array$insert(arr, &$item, index, type); })
+#define Array$insert_value(arr, item_expr, index, type) ({ __typeof(item_expr) item = item_expr; Array$insert(arr, &item, index, type); })
 void Array$insert(array_t *arr, const void *item, int64_t index, const TypeInfo *type);
 void Array$insert_all(array_t *arr, array_t to_insert, int64_t index, const TypeInfo *type);
 void Array$remove(array_t *arr, int64_t index, int64_t count, const TypeInfo *type);