From b5de844736b0247adb2ffedf49252834378db584 Mon Sep 17 00:00:00 2001 From: Marshall Lochbaum Date: Thu, 18 May 2023 14:52:13 -0400 Subject: [PATCH] Constants and tacks with rank, except some dyadic cases --- src/builtins/cells.c | 70 +++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/src/builtins/cells.c b/src/builtins/cells.c index c32fe34d..a767a7a4 100644 --- a/src/builtins/cells.c +++ b/src/builtins/cells.c @@ -304,6 +304,29 @@ static ur cell_rank(f64 r, f64 k) { // ⎉k over arg rank r return k<0? (k+r<0? 0 : k+r) : (k>r? r : k); } +// v˙⎉(-k) x +static B const_cells(B x, ur k, usz* xsh, B v, u32 chr) { // consumes v, x + u32 vr; + if (isAtm(v) || RNK(v)==0) { + if (k!=1) { vr = 0; goto rank0; } + usz cam = xsh[0]; + decG(x); + return C2(shape, m_usz(cam), v); + } else { + vr = RNK(v); + if (vr+k > UR_MAX) thrF("%c: Result rank too large", chr); + rank0:; + f64* shp; B sh = m_f64arrv(&shp, k+vr); + PLAINLOOP for (usz i=0; iflags-1; switch(rtid) { + case n_ltack: case n_rtack: + return x; case n_lt: if (cam==0) goto noCells; // toCells/toKCells don't set outer array fill return k==1 && RNK(x)>1? toCells(x) : k==0? m_unit(x) : toKCells(x, k); @@ -376,26 +401,8 @@ B for_cells_c1(B f, u32 xr, u32 cr, u32 k, B x, u32 chr) { // F⎉cr x, with arr if (rtid==n_after && !isCallable(fd->g)) return for_cells_AS(fd->f, x, inc(fd->g), cr, xr, chr); } } else if (!isMd(f)) { - const_f:; inc(f); - u32 fr; - if (isAtm(f) || RNK(f)==0) { - if (k!=1) { fr = 0; goto const_f_cont; } - usz cam = xsh[0]; - decG(x); - return C2(shape, m_usz(cam), f); - } else { - fr = RNK(f); - if (fr+k > UR_MAX) thrF("%c: Result rank too large", chr); - const_f_cont:; - f64* shp; B sh = m_f64arrv(&shp, fr+k); - PLAINLOOP for (usz i=0; i0 && wcrflags-1; + if (rtid==n_ltack) { dec(x); return w; } + if (rtid==n_rtack) return const_cells(w, wk, wsh, x, chr); + if (IA(w)!=0 && isPervasiveDy(f)) { if (isAtm(x)) return c2(f, w, x); if (RNK(x)!=wcr || !eqShPart(SH(x), wsh+wk, wcr)) goto generic; if (TI(w,elType)==el_B || TI(x,elType)==el_B || (IA(x)>(2048*8)>>arrTypeBitsLog(TY(x)) && IA(w)!=IA(x))) goto generic; return c2(f, w, C2(shape, C1(fne, incG(w)), x)); } + } else if (!isMd(f)) { + dec(x); + return const_cells(w, wk, wsh, inc(f), chr); } generic:; S_KSLICES(w, wsh, wk, cam, 1) incBy(x, cam-1); @@ -502,8 +515,11 @@ NOINLINE B for_cells_SA(B f, B w, B x, ur xcr, ur xr, u32 chr) { ur xk = xr-xcr; assert(xk>0 && xcrflags-1; + if (rtid==n_rtack) { dec(w); return x; } + if (rtid==n_ltack) return const_cells(x, xk, xsh, w, chr); if (rtid==n_select && xk==1 && isF64(w) && xr==2) return select_cells(WRAP(o2i64(w), SH(x)[1], thrF("⊏: Indexing out-of-bounds (𝕨≡%R, %s≡≠𝕩)", w, cam)), x, cam, 1, false); if (rtid==n_pick && xk==1 && TI(x,arrD1) && xr==2 && isF64(w)) return select_cells(WRAP(o2i64(w), SH(x)[1], thrF("⊑: Indexing out-of-bounds (𝕨≡%R, %s≡≠𝕩)", w, cam)), x, cam, 1, true); if ((rtid==n_shifta || rtid==n_shiftb) && xk==1 && xr==2 && isAtm(w)) { @@ -527,6 +543,9 @@ NOINLINE B for_cells_SA(B f, B w, B x, ur xcr, ur xr, u32 chr) { if (TI(w,elType)==el_B || TI(x,elType)==el_B || (IA(w)>(2048*8)>>arrTypeBitsLog(TY(w)) && IA(w)!=IA(x))) goto generic; return c2(f, C2(shape, C1(fne, incG(x)), w), x); } + } else if (!isMd(f)) { + dec(w); + return const_cells(x, xk, xsh, inc(f), chr); } generic:; S_KSLICES(x, xsh, xk, cam, 1) incBy(w, cam-1); @@ -558,6 +577,8 @@ NOINLINE B for_cells_AA(B f, B w, B x, ur wcr, ur xcr, u32 chr) { if (isFun(f)) { if (wk==xk) { u8 rtid = v(f)->flags-1; + if (rtid==n_rtack) { decG(w); return x; } + if (rtid==n_ltack) { decG(x); return w; } if (rtid==n_feq || rtid==n_fne) { Arr* r = match_cells(rtid!=n_feq, w, x, wr, xr, wk, cam); if (r==NULL) goto generic; @@ -572,6 +593,9 @@ NOINLINE B for_cells_AA(B f, B w, B x, ur wcr, ur xcr, u32 chr) { if ((wk>mr?mr:wk) != (xk>mr?mr:xk) || !eqShPart(wsh, xsh, mr)) goto generic; return c2(f, w, x); } + } else if (!isMd(f)) { + dec(xkM? w : x); + return const_cells(xkM? x : w, zk, zsh, inc(f), chr); } generic:;