urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-30 22:15:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Almost ready to kill %cube; hoon.hoon fitz cleansed.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-28 03:45:12 -05:00
parent 86768d7e01
commit 52d6c1e2b4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jets/f/ut_nest.c
View File

@ -202,18 +202,23 @@
return u3m_bail(c3__fail); return u3m_bail(c3__fail);
} }
else { else {
if ( (c3y == u3du(ref)) && (c3__atom == u3h(ref)) ) { if ( c3y == u3r_pq(ref, c3__atom, &p_ref, &q_ref) ) {
if ( (c3n == u3qf_fitz(u3h(u3t(sut)), u3h(u3t(ref)))) || if ( // (c3n == u3qf_fitz(p_sut, p_ref)) ||
( (c3y == u3du(q_sut)) && ( (c3y == u3du(q_sut)) &&
(c3n == u3r_sing(q_sut, u3t(u3t(ref)))) ) ) ( (c3n == u3du(q_ref)) ||
(c3n == u3r_sing(q_sut, q_ref)))) )
{ {
// u3_err("fitz: need", u3h(u3t(sut)));
// u3_err("fitz: have", u3h(u3t(ref)));
return c3n; return c3n;
} }
return c3y; return c3y;
} }
else return _nest_sint(van, sut, tel, ref, gil); if ( (c3y == u3r_pq(ref, c3__cube, &p_ref, &q_ref)) ) {
if ( (c3y == u3du(q_sut)) &&
(c3y == u3r_sing(u3t(q_sut), p_ref)) ) {
return c3y;
}
}
return _nest_sint(van, sut, tel, ref, gil);
} }
} }
case c3__cell: { case c3__cell: {
@ -244,6 +249,10 @@
if ( c3y == u3r_pq(ref, c3__cube, &p_ref, &q_ref) ) { if ( c3y == u3r_pq(ref, c3__cube, &p_ref, &q_ref) ) {
return u3r_sing(p_sut, p_ref); return u3r_sing(p_sut, p_ref);
} }
else if ( (c3y == u3r_pq(ref, c3__atom, &p_ref, &q_ref)) &&
(c3y == u3du(q_ref)) ) {
return u3r_sing(p_sut, u3t(q_ref));
}
else return _nest_sint(van, sut, tel, ref, gil); else return _nest_sint(van, sut, tel, ref, gil);
} }
} }