diff --git a/Makefile b/Makefile index 55849e00ce..d178fadbf8 100644 --- a/Makefile +++ b/Makefile @@ -272,7 +272,6 @@ J_E_OFILES_ED=\ J_F_OFILES=\ jets/f/al.o \ jets/f/ap.o \ - jets/f/bull.o \ jets/f/cell.o \ jets/f/comb.o \ jets/f/cons.o \ diff --git a/jets/f/bull.c b/jets/f/bull.c deleted file mode 100644 index a460bb1cbc..0000000000 --- a/jets/f/bull.c +++ /dev/null @@ -1,30 +0,0 @@ -/* j/6/bull.c -** -*/ -#include "all.h" - - -/* functions -*/ - u3_noun - u3qf_bull(u3_noun bid, - u3_noun der) - { - if ( c3__void == der ) - { - return c3__void; - } - else return u3nt - (c3__bull, u3k(bid), u3k(der)); - } - u3_noun - u3wf_bull(u3_noun cor) - { - u3_noun bid, der; - - if ( c3n == u3r_mean(cor, u3x_sam_2, &bid, u3x_sam_3, &der, 0) ) { - return u3m_bail(c3__fail); - } else { - return u3qf_bull(bid, der); - } - } diff --git a/jets/f/ut_burn.c b/jets/f/ut_burn.c index d6961647a8..bd7fff4a5c 100644 --- a/jets/f/ut_burn.c +++ b/jets/f/ut_burn.c @@ -25,10 +25,6 @@ default: return u3m_bail(c3__fail); case c3__atom: return 0; - case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); - { - return _burn_in(van, q_sut, gil); - } case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { return u3nc diff --git a/jets/f/ut_crop.c b/jets/f/ut_crop.c index 852e3306fe..4a3cf0a2f7 100644 --- a/jets/f/ut_crop.c +++ b/jets/f/ut_crop.c @@ -71,14 +71,6 @@ } else return _crop_sint(van, sut, ref, bix); } - case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); - { - u3_noun foz = _crop_dext(van, q_sut, ref, bix); - u3_noun ret = u3qf_bull(p_sut, foz); - - u3z(foz); - return ret; - } case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { if ( c3__atom == u3h(ref) ) { @@ -182,10 +174,6 @@ switch ( u3h(ref) ) { default: return u3m_bail(c3__fail); - case c3__bull: u3x_cell(u3t(ref), &p_ref, &q_ref); - { - return _crop_dext(van, sut, q_ref, bix); - } case c3__core: case c3__cube: { return u3k(sut); diff --git a/jets/f/ut_firm.c b/jets/f/ut_firm.c index d3f7d43dbd..d25a4b1fdb 100644 --- a/jets/f/ut_firm.c +++ b/jets/f/ut_firm.c @@ -32,10 +32,6 @@ { return u3ud(dib); } - case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); - { - return _cqfu_firm(van, q_sut, dib); - } case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { return c3a(u3du(dib), diff --git a/jets/f/ut_fuse.c b/jets/f/ut_fuse.c index 4b407c30ba..24840df924 100644 --- a/jets/f/ut_fuse.c +++ b/jets/f/ut_fuse.c @@ -72,14 +72,6 @@ } return _fuse_in(van, ref, sut, bix); } - case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); - { - u3_noun vot = _fuse_in(van, q_sut, ref, bix); - u3_noun ret = u3qf_bull(p_sut, vot); - - u3z(vot); - return ret; - } case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun p_ref, q_ref; diff --git a/jets/f/ut_nest.c b/jets/f/ut_nest.c index 71461512a9..5a4ca066cd 100644 --- a/jets/f/ut_nest.c +++ b/jets/f/ut_nest.c @@ -208,13 +208,6 @@ } else return _nest_sint(van, sut, tel, ref, gil); } - case c3__bull: { - if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3m_bail(c3__fail); - } else { - return _nest_dext(van, q_sut, tel, ref, gil); - } - } case c3__cell: { if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { return u3m_bail(c3__fail); @@ -373,13 +366,6 @@ return u3m_bail(c3__fail); } case c3__atom: return c3n; - case c3__bull: { - if ( c3n == u3r_trel(ref, 0, &p_ref, &q_ref) ) { - return u3m_bail(c3__fail); - } else { - return _nest_dext(van, sut, tel, q_ref, gil); - } - } case c3__cell: return c3n; case c3__core: { u3_noun gam = u3qfu_repo(van, ref); diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c index af1ef806e1..f08827d6b7 100644 --- a/jets/f/ut_peek.c +++ b/jets/f/ut_peek.c @@ -35,13 +35,6 @@ case c3__atom: { return c3__void; } - case c3__bull: { - if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { - return u3m_bail(c3__fail); - } else { - return _peek_in(van, q_sut, way, axe, gil); - } - } case c3__cell: { if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { return u3m_bail(c3__fail); diff --git a/jets/f/ut_repo.c b/jets/f/ut_repo.c index 9659b2f4fa..4f82cab0cb 100644 --- a/jets/f/ut_repo.c +++ b/jets/f/ut_repo.c @@ -25,13 +25,6 @@ return u3m_error("repo-flat"); } - case c3__bull: { - if ( c3n == u3r_cell(u3t(sut), &p_sut, &q_sut)) { - return u3m_bail(c3__fail); - } else { - return u3k(q_sut); - } - } case c3__core: { if ( c3n == u3r_cell(u3t(sut), &p_sut, &q_sut) ) { return u3m_bail(c3__fail); diff --git a/jets/f/ut_seek.c b/jets/f/ut_seek.c index 4d84248ba6..f0a171f23e 100644 --- a/jets/f/ut_seek.c +++ b/jets/f/ut_seek.c @@ -21,103 +21,6 @@ } } -#if 0 - static u3_noun - _seek_silk_yew( - u3_noun van, - u3_noun syx, - u3_noun qq_tor) - { - if ( u3_nul == qq_tor ) { - return u3_nul; - } - else { - u3_noun iqq_tor = u3h(qq_tor); - u3_noun qiqq_tor = u3t(iqq_tor); - u3_noun yon = _seek_silk_yew(van, syx, u3t(qq_tor)); - - if ( c3__yew != u3h(qiqq_tor) ) { - return yon; - } else { - u3_noun nuy = u3qf_look(syx, u3t(qiqq_tor)); - - if ( u3_nul == nuy ) { - return u3m_error("silk"); - } - else { - yon = u3nc(u3k(u3t(nuy)), yon); - u3z(nuy); - return yon; - } - } - } - } - static u3_noun - _seek_silk_yaw(u3_noun - u3_noun hey) - { - u3_atom axe = 0; - - while ( u3_nul != hey ) { - if ( axe == 0 ) { - axe = u3h(u3h(hey)); - } else if ( axe != u3h(u3h(hey)) ) { - return u3m_error("silk"); - } - hey = u3t(hey); - } - } - - static u3_noun - _seek_silk_fum(u3_noun - u3_noun hey, - u3_noun qq_tor) - { - if ( u3_nul == qq_tor ) { - return u3_nul; - } - c3_assert(u3_nul != hey); - return u3nc - (u3nc(u3k(u3h(u3h(qq_tor))), - u3k(u3t(u3h(hey)))), - _seek_silk_fum(u3t(hey), u3t(qq_tor))); - } - - static u3_noun - _seek_silk( - u3_noun van, - u3_noun syx, - u3_noun tor) - { - u3_noun p_tor, q_tor, pq_tor, qq_tor; - u3_noun hey, ret; - - u3r_cell(tor, &p_tor, &q_tor); - if ( c3y == u3h(q_tor) ) { - return u3_nul; - } - u3r_cell(u3t(q_tor), &pq_tor, &qq_tor); - - hey = _seek_silk_yew(van, syx, qq_tor); - if ( u3_nul == hey ) { - return u3_nul; - } - if ( u3kb_lent(u3k(hey)) != - u3kb_lent(u3k(qq_tor)) ) - { - return u3m_error("silk"); - } - - ret = u3nq - (u3_nul, - c3n, - u3qc_peg(pq_tor, _seek_silk_yaw(hey)), - _seek_silk_fum(hey, qq_tor)); - - u3z(hey); - return ret; - } -#endif u3_noun _cqfu_seek(u3_noun van, @@ -150,21 +53,6 @@ zar = _cqfu_seek(van, sut, way, t_hyp); u3r_cell(zar, &p_zar, &q_zar); -#if 0 - if ( c3y == u3h(yip) ) { - sic = u3_nul; - } else { - // sic = _seek_silk(van, u3h(u3t(yip)), zar); - sic = u3_nul; - } - if ( u3_nul != sic ) { - u3z(yip); - u3z(zar); - - return u3t(sic); - } -#endif - if ( c3y == u3h(q_zar) ) { syp = u3k(u3t(q_zar)); } else { @@ -270,41 +158,3 @@ } #endif - u3_noun - u3qfu_seep(u3_noun van, - u3_noun sut, - u3_noun way, - u3_noun hyp) - { - u3_noun zar = u3qfu_seek(van, sut, way, hyp); - u3_noun p_zar = u3h(zar); - u3_noun q_zar = u3t(zar); - - if ( c3y != u3h(q_zar) ) { - return u3m_bail(c3__exit); - } - else { - u3_noun ret = u3nc(u3k(p_zar), u3k(u3t(q_zar))); - - u3z(zar); - return ret; - } - } - - u3_noun - u3wfu_seep(u3_noun cor) - { - u3_noun sut, way, hyp, van; - - if ( (c3n == u3r_mean(cor, u3x_sam_2, &way, - u3x_sam_3, &hyp, - u3x_con, &van, - 0)) || - (u3_none == (sut = u3r_at(u3x_sam, van))) ) - { - return u3m_bail(c3__fail); - } else { - return u3qfu_seep(van, sut, way, hyp); - } - } - diff --git a/jets/tree.c b/jets/tree.c index 59dcf624bc..092bbbf908 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -331,7 +331,6 @@ static u3j_harm _mood__hoon_shay_a[] = {{".2", u3we_shay}, {}}; static u3j_harm _mood__hoon_shas_a[] = {{".2", u3we_shas}, {}}; static u3j_harm _mood__hoon_shal_a[] = {{".2", u3we_shal}, {}}; -static u3j_harm _mood__hoon_bull_a[] = {{".2", u3wf_bull}, {}}; static u3j_harm _mood__hoon_cell_a[] = {{".2", u3wf_cell}, {}}; static u3j_harm _mood__hoon_comb_a[] = {{".2", u3wf_comb}, {}}; static u3j_harm _mood__hoon_cons_a[] = {{".2", u3wf_cons}, {}}; @@ -527,7 +526,6 @@ static u3j_core _mood__hoon_d[] = { "shas", _mood__hoon_shas_a }, { "shal", _mood__hoon_shal_a }, - { "bull", _mood__hoon_bull_a }, { "cell", _mood__hoon_cell_a }, { "comb", _mood__hoon_comb_a }, { "cons", _mood__hoon_cons_a },