atomEqualF & atomEEqual cleanup

This commit is contained in:
dzaima 2024-10-10 04:09:10 +03:00
parent 503bddced5
commit 1e00aa71c9

View File

@ -54,16 +54,24 @@ NOINLINE i32 compareF(B w, B x) {
} }
NOINLINE bool atomEqualF(B w, B x) { NOINLINE bool atomEqualF(B w, B x) {
if (TY(w)!=TY(x) || TI(w,byRef)) return false; if (TI(w,byRef) || TY(w)!=TY(x)) return false;
B2B dcf = TI(w,decompose); B2B dcf = TI(w,decompose);
B wd=dcf(incG(w)); B* wdp = harr_ptr(wd);
B xd=dcf(incG(x)); B* xdp=harr_ptr(xd); B xd=dcf(incG(x)); B* xdp=harr_ptr(xd);
if (o2i(wdp[0])<=1) { decG(wd);decG(xd); return false; } if (o2i(xdp[0])<=1) goto decx_ne;
B wd=dcf(incG(w)); B* wdp=harr_ptr(wd);
usz wia = IA(wd); usz wia = IA(wd);
if (wia!=IA(xd)) { decG(wd);decG(xd); return false; } if (wia != IA(xd)) goto dec_ne;
for (u64 i = 0; i<wia; i++) if(!equal(wdp[i], xdp[i])) for (ux i = 0; i < wia; i++) {
{ decG(wd);decG(xd); return false; } if(!equal(wdp[i], xdp[i])) goto dec_ne;
decG(wd);decG(xd); return true; }
decG(wd); decG(xd);
return true;
dec_ne:; decG(wd);
decx_ne:; decG(xd);
return false;
} }
bool atomEEqual(B w, B x) { // doesn't consume bool atomEEqual(B w, B x) { // doesn't consume
@ -71,17 +79,25 @@ bool atomEEqual(B w, B x) { // doesn't consume
#if !NEEQUAL_NEGZERO #if !NEEQUAL_NEGZERO
if (isF64(w) & isF64(x)) return w.f==x.f; if (isF64(w) & isF64(x)) return w.f==x.f;
#endif #endif
if (!isVal(w) | !isVal(x)) return false; if (!isVal(w) || !isVal(x)) return false;
if (TY(w)!=TY(x) || TI(w,byRef)) return false;
if (TI(w,byRef) || TY(w)!=TY(x)) return false;
B2B dcf = TI(w,decompose); B2B dcf = TI(w,decompose);
B wd=dcf(incG(w)); B* wdp = harr_ptr(wd);
B xd=dcf(incG(x)); B* xdp=harr_ptr(xd); B xd=dcf(incG(x)); B* xdp=harr_ptr(xd);
if (o2i(wdp[0])<=1) { decG(wd);decG(xd); return false; } if (o2i(xdp[0])<=1) goto decx_ne;
B wd=dcf(incG(w)); B* wdp=harr_ptr(wd);
usz wia = IA(wd); usz wia = IA(wd);
if (wia!=IA(xd)) { decG(wd);decG(xd); return false; } if (wia != IA(xd)) goto dec_ne;
for (u64 i = 0; i<wia; i++) if(!eequal(wdp[i], xdp[i])) for (ux i = 0; i < wia; i++) {
{ decG(wd);decG(xd); return false; } if(!eequal(wdp[i], xdp[i])) goto dec_ne;
decG(wd);decG(xd); return true; }
decG(wd); decG(xd);
return true;
dec_ne:; decG(wd);
decx_ne:; decG(xd);
return false;
} }
// Functions in eqFns compare segments for matching // Functions in eqFns compare segments for matching