diff options
| author | Bruce Hill <bruce@bruce-hill.com> | 2024-09-04 05:04:45 -0400 |
|---|---|---|
| committer | Bruce Hill <bruce@bruce-hill.com> | 2024-09-04 05:04:45 -0400 |
| commit | af15e89303ba7e37e9f25c2cead4910ab5d09202 (patch) | |
| tree | f1e87eb1a9c31050653559e9729b0f0a5a3a19f7 | |
| parent | 1092185c843d77b5535d44956c1db1aa484d4b74 (diff) | |
For arrays, use implicit filename from macro
| -rw-r--r-- | builtins/array.h | 12 | ||||
| -rw-r--r-- | compile.c | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/builtins/array.h b/builtins/array.h index 9dcdca6f..20529b49 100644 --- a/builtins/array.h +++ b/builtins/array.h @@ -12,20 +12,20 @@ #include "util.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) *({ \ +#define Array_get(item_type, arr_expr, index_expr, start, end) *({ \ const array_t arr = arr_expr; int64_t index = 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: %s (array has length %ld)\n", Text$as_c_string(Int64$as_text(&index, no, NULL)), arr.length); \ + fail_source(__SOURCE_FILE__, start, end, "Invalid array index: %s (array has length %ld)\n", Text$as_c_string(Int64$as_text(&index, no, NULL)), arr.length); \ (item_type*)(arr.data + arr.stride * off);}) #define Array_get_unchecked(type, x, i) *({ const array_t arr = x; int64_t index = i; \ int64_t off = index + (index < 0) * (arr.length + 1) - 1; \ (type*)(arr.data + arr.stride * off);}) -#define Array_lvalue(item_type, arr_expr, index_expr, padded_item_size, filename, start, end) *({ \ +#define Array_lvalue(item_type, arr_expr, index_expr, padded_item_size, start, end) *({ \ array_t *arr = arr_expr; int64_t index = 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: %s (array has length %ld)\n", Text$as_c_string(Int64$as_text(&index, no, NULL)), arr->length); \ + fail_source(__SOURCE_FILE__, start, end, "Invalid array index: %s (array has length %ld)\n", Text$as_c_string(Int64$as_text(&index, no, NULL)), arr->length); \ if (arr->data_refcount > 0) \ Array$compact(arr, padded_item_size); \ (item_type*)(arr->data + arr->stride * off); }) @@ -35,8 +35,8 @@ if (arr->data_refcount > 0) \ Array$compact(arr, padded_item_size); \ (item_type*)(arr->data + arr->stride * off); }) -#define Array_set(item_type, arr, index, value, padded_item_size, filename, start, end) \ - Array_lvalue(item_type, arr_expr, index, padded_item_size, filename, start, end) = value +#define Array_set(item_type, arr, index, value, padded_item_size, start, end) \ + Array_lvalue(item_type, arr_expr, index, padded_item_size, start, end) = value #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]), \ @@ -230,7 +230,7 @@ static CORD compile_lvalue(env_t *env, ast_t *ast) return CORD_all("Array_lvalue(", compile_type(item_type), ", ", target_code, ", ", compile_int_to_type(env, index->index, Type(IntType, .bits=TYPE_IBITS64)), ", ", CORD_asprintf("%ld", padded_type_size(item_type)), - ", ", CORD_quoted(ast->file->filename), ", ", heap_strf("%ld", ast->start - ast->file->text), + ", ", heap_strf("%ld", ast->start - ast->file->text), ", ", heap_strf("%ld", ast->end - ast->file->text), ")"); } } else { @@ -2811,7 +2811,6 @@ CORD compile(env_t *env, ast_t *ast) else return CORD_all("Array_get(", compile_type(item_type), ", ", arr, ", ", compile_int_to_type(env, indexing->index, Type(IntType, .bits=TYPE_IBITS64)), ", ", - CORD_quoted(f->filename), ", ", CORD_asprintf("%ld", (int64_t)(indexing->index->start - f->text)), ", ", CORD_asprintf("%ld", (int64_t)(indexing->index->end - f->text)), ")"); |