O -> CO

1 files changed, 4 insertions, 4 deletions

diff --git a/o.c b/o.c
index 576949b9..ab739629 100644
--- a/o.c
+++ b/o.c
@@ -12,9 +12,9 @@ NI B mtc_(A x,A y/*00*/)_(
  i(xn|!xn,P(!mtc_(xa,ya),0))1)
 
 A2(mtc,/*01*/y(ai(mtc_(x,y))))
-S O W o=(-1ull>>12)-1;S L t(L v)_(v^(W)(v>>63)>>1);S A of_(A,I);
-S L o0(L v)_(t(v-o))S V of0LL(O L*a,L*r,N n){i(n+3&~3,r[i]=o0(a[i]))}A1(of0,Q(xtlL);of_(x,0))
-S L o1(L v)_(t(v)+o)S V of1LL(O L*a,L*r,N n){i(n+3&~3,r[i]=o1(a[i]))}A1(of1,Q(xtfF);of_(x,1))
+S CO W o=(-1ull>>12)-1;S L t(L v)_(v^(W)(v>>63)>>1);S A of_(A,I);
+S L o0(L v)_(t(v-o))S V of0LL(CO L*a,L*r,N n){i(n+3&~3,r[i]=o0(a[i]))}A1(of0,Q(xtlL);of_(x,0))
+S L o1(L v)_(t(v)+o)S V of1LL(CO L*a,L*r,N n){i(n+3&~3,r[i]=o1(a[i]))}A1(of1,Q(xtfF);of_(x,1))
 S A of_(A x,I f)_(N n=xn;C t=xt+(tf-tl)*(1-2*f);A y=xr-1?an(n,t):AT(t,xR);Mx((f?of1LL:of0LL)(xV,yV,n))y)
 S I ql(L i,L j)_(i<j?-1:i>j)
 I qf(F u,F v)_(ql(o1(*(L*)&u),o1(*(L*)&v)))
@@ -25,7 +25,7 @@ I qA(A x,A y/*00*/)_(I v=TS[xt]-TS[yt];P(v,v)
    RT(i(MIN(xn,yn),A z=ii(x,i),u=ii(y,i);I d=qA(z,u);mr(z(u));P(d,d))ql(xn,yn))
    Ropqr(x=str(xR);y=str(yR);I r=qA(x,y);x(y(0));r)
    R_(ql(x,y)))0)
-S I*ascZ(O UC*v,UC*g,I*a,I*b,I n,I w)_(U c[257];tilV(a,0,n,2);j(w,MS(c,0,SZ c);i(n,g[i]=v[w*a[i]+j])i(n,c[g[i]+1]++)I(c[1+*g]-n,i(255,c[i+1]+=c[i])i(n,b[c[g[i]]++]=a[i])SWP(b,a)))a)
+S I*ascZ(CO UC*v,UC*g,I*a,I*b,I n,I w)_(U c[257];tilV(a,0,n,2);j(w,MS(c,0,SZ c);i(n,g[i]=v[w*a[i]+j])i(n,c[g[i]+1]++)I(c[1+*g]-n,i(255,c[i+1]+=c[i])i(n,b[c[g[i]]++]=a[i])SWP(b,a)))a)
 S A grdm(A x/*1*/,A1 f)_(A y=kv(&x);x(x1(Nx(f(y)))))
 
 S V mrg(A x/*0*/,I*p,I*q,I*b,I*d,I k){I*r=p-q+b;W(1,I(qA(xA[*p],xA[*b])<k,*r++=*p++;P(p==q))E(*r++=*b++;B(b==d)))MC(r,p,q-p<<2);}//merge(k=1),mergeR(k=0)