urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-30 07:35:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

u3: WIP refactors +uni:by jet

Browse Source
This commit is contained in:
Joe Bryan 2020-05-07 15:48:48 -07:00
parent 03d80b8c63
commit 1695977655
1 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
pkg/urbit/jets/d/by_uni.c
View File

@ -11,12 +11,12 @@ u3_noun
u3qdb_uni(u3_noun a, u3qdb_uni(u3_noun a,
u3_noun b) u3_noun b)
{ {
if ( u3_nul == a ) { if ( u3_nul == b ) {
return u3k(b);
}
else if ( u3_nul == b ) {
return u3k(a); return u3k(a);
} }
else if ( u3_nul == a ) {
return u3k(b);
}
else { else {
u3_noun n_a, l_a, r_a; u3_noun n_a, l_a, r_a;
u3_noun n_b, l_b, r_b; u3_noun n_b, l_b, r_b;
@ -27,59 +27,62 @@ u3qdb_uni(u3_noun a,
u3x_cell(n_a, &p_n_a, &q_n_a); u3x_cell(n_a, &p_n_a, &q_n_a);
u3x_cell(n_b, &p_n_b, &q_n_b); u3x_cell(n_b, &p_n_b, &q_n_b);
if ( c3y == u3qc_mor(p_n_a, p_n_b) ) {
if ( c3y == u3r_sing(p_n_a, p_n_b) ) { if ( c3y == u3r_sing(p_n_a, p_n_b) ) {
return u3nt(u3k(n_b), return u3nt(u3k(n_b),
u3qdb_uni(u3k(l_a), u3qdb_uni(l_a, l_b),
u3k(l_b)), u3qdb_uni(r_a, r_b));
u3qdb_uni(u3k(r_a),
u3k(r_b)));
} }
else if ( c3y == u3qc_gor(p_n_b, p_n_a) ) { else if ( c3y == u3qc_mor(p_n_a, p_n_b) ) {
return u3qdb_uni( u3_noun new_a, old_b;
u3nt(u3k(n_a),
u3qdb_uni(u3k(l_a), if ( c3y == u3qc_gor(p_n_b, p_n_a) ) {
u3nt(u3k(n_b), u3_noun new_b = u3nt(u3k(n_b), u3k(l_b), u3_nul);
u3k(l_b), u3_noun new_la = u3qdb_uni(l_a, new_b);
u3k(u3_nul))), u3z(new_b);
u3k(r_a)),
u3k(r_b)); new_a = u3nt(u3k(n_a), new_la, u3k(r_a));
old_b = r_b;
} }
else { else {
return u3qdb_uni( u3_noun new_b = u3nt(u3k(n_b), u3_nul, u3k(r_b));
u3nt(u3k(n_a), u3_noun new_ra = u3qdb_uni(r_a, new_b);
u3k(l_a), u3z(new_b);
u3qdb_uni(u3k(r_a),
u3nt(u3k(n_b), new_a = u3nt(u3k(n_a), u3k(l_a), new_ra);
u3k(u3_nul), old_b = l_b;
u3k(r_b)))),
u3k(l_b));
} }
{
u3_noun pro = u3qdb_uni(new_a, old_b);
u3z(new_a);
return pro;
} }
else if ( c3y == u3r_sing(p_n_b, p_n_a) ) {
return u3nt(u3k(n_b),
u3qdb_uni(u3k(r_b), u3k(r_a)),
u3qdb_uni(u3k(l_b), u3k(l_a)));
}
else if ( c3y == u3qc_gor(p_n_a, p_n_b) ) {
return u3qdb_uni(
u3k(r_a),
u3nt(u3k(n_b),
u3qdb_uni(u3nt(u3k(n_a),
u3k(l_a),
u3k(u3_nul)),
u3k(l_b)),
u3k(r_b)));
} }
else { else {
return u3qdb_uni( u3_noun old_a, new_b;
u3k(l_a),
u3nt(u3k(n_b), if ( c3y == u3qc_gor(p_n_a, p_n_b) ) {
u3k(l_b), u3_noun new_a = u3nt(u3k(n_a), u3k(l_a), u3_nul);
u3qdb_uni(u3k(r_b), u3_noun new_lb = u3qdb_uni(new_a, l_b);
u3nt(u3k(n_a), u3z(new_a);
u3k(u3_nul),
u3k(r_a))))); new_b = u3nt(u3k(n_b), new_lb, u3k(r_b));
old_a = r_a;
}
else {
u3_noun new_a = u3nt(u3k(n_a), u3_nul, u3k(r_a));
u3_noun new_rb = u3qdb_uni(new_a, r_b);
u3z(new_a);
new_b = u3nt(u3k(n_b), u3k(l_b), new_rb);
old_a = l_a;
}
{
u3_noun pro = u3qdb_uni(old_a, new_b);
u3z(new_b);
return pro;
}
} }
} }
} }