more eachd_fn and eachm_fn out of header file
This commit is contained in:
parent
1c83483d53
commit
dac6f29a41
2
makefile
2
makefile
@ -93,7 +93,7 @@ ${bd}/%.o: src/%.c
|
||||
@echo $< | cut -c 5-
|
||||
@$(CMD) $@.d -o $@ -c $<
|
||||
|
||||
utils: builddir ${addprefix ${bd}/, utf.o hash.o file.o mut.o}
|
||||
utils: builddir ${addprefix ${bd}/, utf.o hash.o file.o mut.o each.o}
|
||||
${bd}/%.o: src/utils/%.c
|
||||
@echo $< | cut -c 5-
|
||||
@$(CMD) $@.d -o $@ -c $<
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
#include "../utils/utf.c"
|
||||
#include "../utils/file.c"
|
||||
#include "../utils/mut.c"
|
||||
#include "../utils/each.c"
|
||||
#include "../builtins/fns.c"
|
||||
#include "../builtins/sfns.c"
|
||||
#include "../builtins/sysfn.c"
|
||||
|
||||
134
src/utils/each.c
Normal file
134
src/utils/each.c
Normal file
@ -0,0 +1,134 @@
|
||||
#include "../core.h"
|
||||
#include "each.h"
|
||||
|
||||
static inline B mv(B* p, usz n) { B r = p [n]; p [n] = m_f64(0); return r; }
|
||||
static inline B hmv(HArr_p p, usz n) { B r = p.a[n]; p.a[n] = m_f64(0); return r; }
|
||||
|
||||
B eachd_fn(BBB2B f, B fo, B w, B x) {
|
||||
if (isAtm(w)) w = m_atomUnit(w);
|
||||
if (isAtm(x)) x = m_atomUnit(x);
|
||||
ur wr = rnk(w); SGet(w);
|
||||
ur xr = rnk(x); SGet(x);
|
||||
bool wg = wr>xr;
|
||||
ur rM = wg? wr : xr;
|
||||
ur rm = wg? xr : wr;
|
||||
if (rM==0) {
|
||||
B r = f(fo, Get(w,0), Get(x,0));
|
||||
dec(w); dec(x);
|
||||
return m_hunit(r);
|
||||
}
|
||||
if (rm && !eqShPrefix(a(w)->sh, a(x)->sh, rm)) thrF("Mapping: Expected equal shape prefix (%H ≡ ≢𝕨, %H ≡ ≢𝕩)", w, x);
|
||||
bool rw = rM==wr && ((v(w)->type==t_harr) & reusable(w)); // v(…) is safe as rank>0
|
||||
bool rx = rM==xr && ((v(x)->type==t_harr) & reusable(x));
|
||||
if (rw|rx && (wr==xr | rm==0)) {
|
||||
HArr_p r = harr_parts(REUSE(rw? w : x));
|
||||
usz ria = r.c->ia;
|
||||
if (wr==0) { B c=Get(w, 0); for(usz i = 0; i < ria; i++) r.a[i] = f(fo, inc(c), hmv(r,i)); dec(c); }
|
||||
else if (xr==0) { B c=Get(x, 0); for(usz i = 0; i < ria; i++) r.a[i] = f(fo, hmv(r,i), inc(c) ); dec(c); }
|
||||
else {
|
||||
assert(wr==xr);
|
||||
if (rw) for (usz i = 0; i < ria; i++) r.a[i] = f(fo, hmv(r,i), Get(x,i));
|
||||
else for (usz i = 0; i < ria; i++) r.a[i] = f(fo, Get(w,i), hmv(r,i));
|
||||
}
|
||||
dec(rw? x : w);
|
||||
return r.b;
|
||||
}
|
||||
|
||||
B bo = wg? w : x;
|
||||
usz ria = a(bo)->ia;
|
||||
usz ri = 0;
|
||||
HArr_p r = m_harrs(ria, &ri);
|
||||
if (wr==xr) for(; ri < ria; ri++) r.a[ri] = f(fo, Get(w,ri), Get(x,ri));
|
||||
else if (wr==0) { B c=Get(w, 0); for(; ri < ria; ri++) r.a[ri] = f(fo, inc(c) , Get(x,ri)); dec(c); }
|
||||
else if (xr==0) { B c=Get(x, 0); for(; ri < ria; ri++) r.a[ri] = f(fo, Get(w,ri), inc(c) ); dec(c); }
|
||||
else if (ria>0) {
|
||||
usz min = wg? a(x)->ia : a(w)->ia;
|
||||
usz ext = ria / min;
|
||||
if (wg) for (usz i = 0; i < min; i++) { B c=Get(x,i); for (usz j = 0; j < ext; j++,ri++) r.a[ri] = f(fo, Get(w,ri), inc(c)); }
|
||||
else for (usz i = 0; i < min; i++) { B c=Get(w,i); for (usz j = 0; j < ext; j++,ri++) r.a[ri] = f(fo, inc(c), Get(x,ri)); }
|
||||
}
|
||||
B rb = harr_fc(r, bo);
|
||||
dec(w); dec(x);
|
||||
return rb;
|
||||
}
|
||||
|
||||
B eachm_fn(BB2B f, B fo, B x) {
|
||||
usz ia = a(x)->ia;
|
||||
if (ia==0) return x;
|
||||
SGet(x);
|
||||
usz i = 0;
|
||||
B cr = f(fo, Get(x,0));
|
||||
HArr_p rH;
|
||||
if (TI(x,canStore)(cr)) {
|
||||
bool reuse = reusable(x);
|
||||
if (v(x)->type==t_harr) {
|
||||
B* xp = harr_ptr(x);
|
||||
if (reuse) {
|
||||
dec(xp[i]); xp[i++] = cr;
|
||||
for (; i < ia; i++) xp[i] = f(fo, mv(xp,i));
|
||||
return REUSE(x);
|
||||
} else {
|
||||
rH = m_harrs(ia, &i);
|
||||
rH.a[i++] = cr;
|
||||
for (; i < ia; i++) rH.a[i] = f(fo, inc(xp[i]));
|
||||
return harr_fcd(rH, x);
|
||||
}
|
||||
} else if (TI(x,elType)==el_i32) {
|
||||
i32* xp = i32any_ptr(x);
|
||||
B r; i32* rp;
|
||||
if (reuse && v(x)->type==t_i32arr) { r=inc(REUSE(x)); rp = xp; }
|
||||
else r = m_i32arrc(&rp, x);
|
||||
rp[i++] = o2iu(cr);
|
||||
for (; i < ia; i++) {
|
||||
cr = f(fo, m_i32(xp[i]));
|
||||
if (!q_i32(cr)) {
|
||||
rH = m_harrs(ia, &i);
|
||||
for (usz j = 0; j < i; j++) rH.a[j] = m_i32(rp[j]);
|
||||
dec(r);
|
||||
goto fallback;
|
||||
}
|
||||
rp[i] = o2iu(cr);
|
||||
}
|
||||
dec(x);
|
||||
return r;
|
||||
} else if (TI(x,elType)==el_f64) {
|
||||
f64* xp = f64any_ptr(x);
|
||||
B r; f64* rp;
|
||||
if (reuse && v(x)->type==t_f64arr) { r=inc(REUSE(x)); rp = xp; }
|
||||
else r = m_f64arrc(&rp, x);
|
||||
rp[i++] = o2fu(cr);
|
||||
for (; i < ia; i++) {
|
||||
cr = f(fo, m_f64(xp[i]));
|
||||
if (!q_f64(cr)) {
|
||||
rH = m_harrs(ia, &i);
|
||||
for (usz j = 0; j < i; j++) rH.a[j] = m_f64(rp[j]);
|
||||
dec(r);
|
||||
goto fallback;
|
||||
}
|
||||
rp[i] = o2fu(cr);
|
||||
}
|
||||
dec(x);
|
||||
return r;
|
||||
} else if (v(x)->type==t_fillarr) {
|
||||
B* xp = fillarr_ptr(a(x));
|
||||
if (reuse) {
|
||||
dec(c(FillArr,x)->fill);
|
||||
c(FillArr,x)->fill = bi_noFill;
|
||||
dec(xp[i]); xp[i++] = cr;
|
||||
for (; i < ia; i++) xp[i] = f(fo, mv(xp,i));
|
||||
return REUSE(x);
|
||||
} else {
|
||||
HArr_p rp = m_harrs(ia, &i);
|
||||
rp.a[i++] = cr;
|
||||
for (; i < ia; i++) rp.a[i] = f(fo, inc(xp[i]));
|
||||
return harr_fcd(rp, x);
|
||||
}
|
||||
} else
|
||||
rH = m_harrs(ia, &i);
|
||||
} else
|
||||
rH = m_harrs(ia, &i);
|
||||
fallback:
|
||||
rH.a[i++] = cr;
|
||||
for (; i < ia; i++) rH.a[i] = f(fo, Get(x,i));
|
||||
return harr_fcd(rH, x);
|
||||
}
|
||||
133
src/utils/each.h
133
src/utils/each.h
@ -1,137 +1,8 @@
|
||||
#pragma once
|
||||
#include "mut.h"
|
||||
|
||||
static inline B mv(B* p, usz n) { B r = p [n]; p [n] = m_f64(0); return r; }
|
||||
static inline B hmv(HArr_p p, usz n) { B r = p.a[n]; p.a[n] = m_f64(0); return r; }
|
||||
|
||||
static B eachd_fn(BBB2B f, B fo, B w, B x) { // consumes w,x; assumes at least one is array
|
||||
if (isAtm(w)) w = m_atomUnit(w);
|
||||
if (isAtm(x)) x = m_atomUnit(x);
|
||||
ur wr = rnk(w); SGet(w);
|
||||
ur xr = rnk(x); SGet(x);
|
||||
bool wg = wr>xr;
|
||||
ur rM = wg? wr : xr;
|
||||
ur rm = wg? xr : wr;
|
||||
if (rM==0) {
|
||||
B r = f(fo, Get(w,0), Get(x,0));
|
||||
dec(w); dec(x);
|
||||
return m_hunit(r);
|
||||
}
|
||||
if (rm && !eqShPrefix(a(w)->sh, a(x)->sh, rm)) thrF("Mapping: Expected equal shape prefix (%H ≡ ≢𝕨, %H ≡ ≢𝕩)", w, x);
|
||||
bool rw = rM==wr && ((v(w)->type==t_harr) & reusable(w)); // v(…) is safe as rank>0
|
||||
bool rx = rM==xr && ((v(x)->type==t_harr) & reusable(x));
|
||||
if (rw|rx && (wr==xr | rm==0)) {
|
||||
HArr_p r = harr_parts(REUSE(rw? w : x));
|
||||
usz ria = r.c->ia;
|
||||
if (wr==0) { B c=Get(w, 0); for(usz i = 0; i < ria; i++) r.a[i] = f(fo, inc(c), hmv(r,i)); dec(c); }
|
||||
else if (xr==0) { B c=Get(x, 0); for(usz i = 0; i < ria; i++) r.a[i] = f(fo, hmv(r,i), inc(c) ); dec(c); }
|
||||
else {
|
||||
assert(wr==xr);
|
||||
if (rw) for (usz i = 0; i < ria; i++) r.a[i] = f(fo, hmv(r,i), Get(x,i));
|
||||
else for (usz i = 0; i < ria; i++) r.a[i] = f(fo, Get(w,i), hmv(r,i));
|
||||
}
|
||||
dec(rw? x : w);
|
||||
return r.b;
|
||||
}
|
||||
|
||||
B bo = wg? w : x;
|
||||
usz ria = a(bo)->ia;
|
||||
usz ri = 0;
|
||||
HArr_p r = m_harrs(ria, &ri);
|
||||
if (wr==xr) for(; ri < ria; ri++) r.a[ri] = f(fo, Get(w,ri), Get(x,ri));
|
||||
else if (wr==0) { B c=Get(w, 0); for(; ri < ria; ri++) r.a[ri] = f(fo, inc(c) , Get(x,ri)); dec(c); }
|
||||
else if (xr==0) { B c=Get(x, 0); for(; ri < ria; ri++) r.a[ri] = f(fo, Get(w,ri), inc(c) ); dec(c); }
|
||||
else if (ria>0) {
|
||||
usz min = wg? a(x)->ia : a(w)->ia;
|
||||
usz ext = ria / min;
|
||||
if (wg) for (usz i = 0; i < min; i++) { B c=Get(x,i); for (usz j = 0; j < ext; j++,ri++) r.a[ri] = f(fo, Get(w,ri), inc(c)); }
|
||||
else for (usz i = 0; i < min; i++) { B c=Get(w,i); for (usz j = 0; j < ext; j++,ri++) r.a[ri] = f(fo, inc(c), Get(x,ri)); }
|
||||
}
|
||||
B rb = harr_fc(r, bo);
|
||||
dec(w); dec(x);
|
||||
return rb;
|
||||
}
|
||||
|
||||
static B eachm_fn(BB2B f, B fo, B x) { // consumes x; x must be array
|
||||
usz ia = a(x)->ia;
|
||||
if (ia==0) return x;
|
||||
SGet(x);
|
||||
usz i = 0;
|
||||
B cr = f(fo, Get(x,0));
|
||||
HArr_p rH;
|
||||
if (TI(x,canStore)(cr)) {
|
||||
bool reuse = reusable(x);
|
||||
if (v(x)->type==t_harr) {
|
||||
B* xp = harr_ptr(x);
|
||||
if (reuse) {
|
||||
dec(xp[i]); xp[i++] = cr;
|
||||
for (; i < ia; i++) xp[i] = f(fo, mv(xp,i));
|
||||
return REUSE(x);
|
||||
} else {
|
||||
rH = m_harrs(ia, &i);
|
||||
rH.a[i++] = cr;
|
||||
for (; i < ia; i++) rH.a[i] = f(fo, inc(xp[i]));
|
||||
return harr_fcd(rH, x);
|
||||
}
|
||||
} else if (TI(x,elType)==el_i32) {
|
||||
i32* xp = i32any_ptr(x);
|
||||
B r; i32* rp;
|
||||
if (reuse && v(x)->type==t_i32arr) { r=inc(REUSE(x)); rp = xp; }
|
||||
else r = m_i32arrc(&rp, x);
|
||||
rp[i++] = o2iu(cr);
|
||||
for (; i < ia; i++) {
|
||||
cr = f(fo, m_i32(xp[i]));
|
||||
if (!q_i32(cr)) {
|
||||
rH = m_harrs(ia, &i);
|
||||
for (usz j = 0; j < i; j++) rH.a[j] = m_i32(rp[j]);
|
||||
dec(r);
|
||||
goto fallback;
|
||||
}
|
||||
rp[i] = o2iu(cr);
|
||||
}
|
||||
dec(x);
|
||||
return r;
|
||||
} else if (TI(x,elType)==el_f64) {
|
||||
f64* xp = f64any_ptr(x);
|
||||
B r; f64* rp;
|
||||
if (reuse && v(x)->type==t_f64arr) { r=inc(REUSE(x)); rp = xp; }
|
||||
else r = m_f64arrc(&rp, x);
|
||||
rp[i++] = o2fu(cr);
|
||||
for (; i < ia; i++) {
|
||||
cr = f(fo, m_f64(xp[i]));
|
||||
if (!q_f64(cr)) {
|
||||
rH = m_harrs(ia, &i);
|
||||
for (usz j = 0; j < i; j++) rH.a[j] = m_f64(rp[j]);
|
||||
dec(r);
|
||||
goto fallback;
|
||||
}
|
||||
rp[i] = o2fu(cr);
|
||||
}
|
||||
dec(x);
|
||||
return r;
|
||||
} else if (v(x)->type==t_fillarr) {
|
||||
B* xp = fillarr_ptr(a(x));
|
||||
if (reuse) {
|
||||
dec(c(FillArr,x)->fill);
|
||||
c(FillArr,x)->fill = bi_noFill;
|
||||
dec(xp[i]); xp[i++] = cr;
|
||||
for (; i < ia; i++) xp[i] = f(fo, mv(xp,i));
|
||||
return REUSE(x);
|
||||
} else {
|
||||
HArr_p rp = m_harrs(ia, &i);
|
||||
rp.a[i++] = cr;
|
||||
for (; i < ia; i++) rp.a[i] = f(fo, inc(xp[i]));
|
||||
return harr_fcd(rp, x);
|
||||
}
|
||||
} else
|
||||
rH = m_harrs(ia, &i);
|
||||
} else
|
||||
rH = m_harrs(ia, &i);
|
||||
fallback:
|
||||
rH.a[i++] = cr;
|
||||
for (; i < ia; i++) rH.a[i] = f(fo, Get(x,i));
|
||||
return harr_fcd(rH, x);
|
||||
}
|
||||
B eachd_fn(BBB2B f, B fo, B w, B x); // consumes w,x; assumes at least one is array
|
||||
B eachm_fn(BB2B f, B fo, B x); // consumes x; x must be array
|
||||
|
||||
static B eachm(B f, B x) { // complete F¨ x without fills
|
||||
if (isAtm(x)) return m_hunit(c1(f, x));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user