diff --git a/src/builtins/cells.c b/src/builtins/cells.c index 578b17f5..42667ba0 100644 --- a/src/builtins/cells.c +++ b/src/builtins/cells.c @@ -293,7 +293,7 @@ static void set_column_typed(void* rp, B v, u8 e, ux p, ux stride, ux n) { // ma bit_special:; bool b = o2bG(v); B m1 = taga(arr_shVec(b? allZeroes(stride) : allOnes(stride))); - bitp_set(bitany_ptr(m1), p, b); + bitp_set(bitarr_ptr(m1), p, b); B m = C2(shape, m_f64(stride*n+8), m1); // +8 to make the following loops reading past-the-end read acceptable values assert(TI(m,elType)==el_bit); u8* mp = (u8*)bitany_ptr(m); diff --git a/src/builtins/group.c b/src/builtins/group.c index a17c3e9a..96c6ab48 100644 --- a/src/builtins/group.c +++ b/src/builtins/group.c @@ -218,7 +218,7 @@ static B group_simple(B w, B x, ur xr, usz wia, usz xn, usz* xsh, u8 we) { allocBitGroups(rp, ria, z, xr, xsh, len, width); for (usz i = 0; i < xn; i++) { bool b = bitp_get(xp,i); i32 n = wp[i]; - if (n>=0) bitp_set(bitany_ptr(rp[n]), pos[n]++, b); + if (n>=0) bitp_set(bitarr_ptr(rp[n]), pos[n]++, b); } } else { // Generic case for (usz i = 0; i < ria; i++) { diff --git a/src/builtins/internal.c b/src/builtins/internal.c index 990ea91e..fea26301 100644 --- a/src/builtins/internal.c +++ b/src/builtins/internal.c @@ -308,7 +308,7 @@ B internalTemp_c1(B t, B x) { #endif #ifdef TEST_BITCPY SGetU(x) - bit_cpyN(bitany_ptr(GetU(x,0)), o2s(GetU(x,1)), bitany_ptr(GetU(x,2)), o2s(GetU(x,3)), o2s(GetU(x,4))); + bit_cpyN(bitarr_ptr(GetU(x,0)), o2s(GetU(x,1)), bitany_ptr(GetU(x,2)), o2s(GetU(x,3)), o2s(GetU(x,4))); #endif return x; } diff --git a/src/builtins/scan.c b/src/builtins/scan.c index edd8ee18..ba46aa75 100644 --- a/src/builtins/scan.c +++ b/src/builtins/scan.c @@ -261,9 +261,9 @@ B scan_c1(Md1D* d, B x) { B f = d->f; case n_eq: return scan_eq(x, ia); // = case n_lt: return scan_lt(x, 0, ia); // < case n_le: return bit_negate(scan_lt(bit_negate(x), 0, ia)); // ≤ - case n_gt: x=bit_negate(x); *bitany_ptr(x)^= 1; return scan_and(x, ia); // > - case n_ge: x=bit_negate(x); *bitany_ptr(x)^= 1; return scan_or (x, ia); // ≥ - case n_sub: return C2(sub, m_f64(2 * (*bitany_ptr(x) & 1)), scan_add_bool(x, ia)); // - + case n_gt: x=bit_negate(x); *bitarr_ptr(x)^= 1; return scan_and(x, ia); // > + case n_ge: x=bit_negate(x); *bitarr_ptr(x)^= 1; return scan_or (x, ia); // ≥ + case n_sub: return C2(sub, m_f64(2 * (*bitarr_ptr(x) & 1)), scan_add_bool(x, ia)); // - } if (rtid==n_add) return scan_plus(0, x, xe, ia); // + if (rtid==n_floor) return scan_min_num(x, xe, ia); // ⌊ diff --git a/src/builtins/slash.c b/src/builtins/slash.c index 26fa6d48..7f6b42a8 100644 --- a/src/builtins/slash.c +++ b/src/builtins/slash.c @@ -362,7 +362,7 @@ B grade_bool(B x, usz xia, bool up) { if (xia < 16) { BRANCHLESS_GRADE(i8) } else if (xia <= 1<<15) { B notx = bit_negate(incG(x)); - u64* xp0 = bitany_ptr(notx); + u64* xp0 = bitarr_ptr(notx); u64* xp1 = xp; u64 q=xia%64; if (q) { usz e=xia/64; u64 m=((u64)1<