From 42b3be3232955a15fe0b24520d081b65f77948bd Mon Sep 17 00:00:00 2001 From: pilfer-pandex <47340789+pilfer-pandex@users.noreply.github.com> Date: Wed, 21 Aug 2019 17:23:30 -0700 Subject: [PATCH] jets: rm nest (keep dext); find was dead code --- pkg/urbit/include/jets/w.h | 1 - pkg/urbit/jets/f/ut_find.c | 27 --------------------------- pkg/urbit/jets/f/ut_nest.c | 31 ------------------------------- pkg/urbit/jets/tree.c | 3 +-- 4 files changed, 1 insertion(+), 61 deletions(-) diff --git a/pkg/urbit/include/jets/w.h b/pkg/urbit/include/jets/w.h index c90b170160..98d8e07db3 100644 --- a/pkg/urbit/include/jets/w.h +++ b/pkg/urbit/include/jets/w.h @@ -277,7 +277,6 @@ u3_noun u3wfu_fuse(u3_noun); u3_noun u3wfu_mint(u3_noun); u3_noun u3wfu_mull(u3_noun); - u3_noun u3wfu_nest(u3_noun); u3_noun u3wfu_nest_dext(u3_noun); u3_noun u3wfu_peek(u3_noun); u3_noun u3wfu_play(u3_noun); diff --git a/pkg/urbit/jets/f/ut_find.c b/pkg/urbit/jets/f/ut_find.c index a5b62dd0ef..6d6cbbade5 100644 --- a/pkg/urbit/jets/f/ut_find.c +++ b/pkg/urbit/jets/f/ut_find.c @@ -3,33 +3,6 @@ */ #include "all.h" - u3_noun - u3wfu_find(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 { - c3_m fun_m = 141 + c3__find + ((!!u3r_at(u3qfu_van_vet, van)) << 8); - u3_noun pro = u3z_find_3(fun_m, sut, way, hyp); - - if ( u3_none != pro ) { - return pro; - } - else { - pro = u3n_nock_on(u3k(cor), u3k(u3x_at(u3x_bat, cor))); - - return u3z_save_3(fun_m, sut, way, hyp, pro); - } - } - } - u3_noun u3wfu_fond(u3_noun cor) { diff --git a/pkg/urbit/jets/f/ut_nest.c b/pkg/urbit/jets/f/ut_nest.c index 7c246b9d2a..1b72cb6ec0 100644 --- a/pkg/urbit/jets/f/ut_nest.c +++ b/pkg/urbit/jets/f/ut_nest.c @@ -41,34 +41,3 @@ } } } - - u3_noun - u3wfu_nest(u3_noun cor) - { - u3_noun sut, tel, ref, van; - - if ( (c3n == u3r_mean(cor, u3x_sam_2, &tel, - u3x_sam_3, &ref, - u3x_con, &van, - 0)) || - (c3n == u3ud(tel)) || (tel > 1) || - (u3_none == (sut = u3r_at(u3x_sam, van))) ) - { - return u3m_bail(c3__fail); - } else { - c3_m fun_m = 141 + c3__nest; - u3_noun vrf = u3r_at(u3qfu_van_vrf, van); - u3_noun pro = u3z_find_4(fun_m, vrf, sut, tel, ref); - - if ( u3_none != pro ) { - // u3t_heck(c3__good); - return pro; - } - else { - pro = u3n_nock_on(u3k(cor), u3k(u3x_at(u3x_bat, cor))); - - // u3t_heck(c3__nest); - return u3z_save_4(fun_m, vrf, sut, tel, ref, pro); - } - } - } diff --git a/pkg/urbit/jets/tree.c b/pkg/urbit/jets/tree.c index 16459f62dc..43c266a960 100644 --- a/pkg/urbit/jets/tree.c +++ b/pkg/urbit/jets/tree.c @@ -450,7 +450,6 @@ static c3_c* _141_pen_loot_ha[] = { "9fe555b3f9ad666f04194037437d71ee98f6b884f7aacc46a11ad27407cb7e8e", 0 }; - static u3j_harm _141_pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; static c3_c* _141_pen__ut_nest_ha[] = {0}; static u3j_harm _141_pen__ut_nest_dext_a[] = {{".2", u3wfu_nest_dext}, {}}; static c3_c* _141_pen__ut_nest_dext_ha[] = {0}; @@ -489,7 +488,7 @@ static u3j_core _141_pen__ut_d[] = { "fuse", 7, _141_pen__ut_fuse_a, 0, _141_pen__ut_fuse_ha }, { "mint", 7, _141_pen__ut_mint_a, 0, _141_pen__ut_mint_ha }, { "mull", 7, _141_pen__ut_mull_a, 0, _141_pen__ut_mull_ha }, - { "nest", 7, _141_pen__ut_nest_a, _141_pen__ut_nest_d, _141_pen__ut_nest_ha }, + { "nest", 7, 0, _141_pen__ut_nest_d, _141_pen__ut_nest_ha }, { "peek", 7, _141_pen__ut_peek_a, 0, _141_pen__ut_peek_ha }, { "play", 7, _141_pen__ut_play_a, 0, _141_pen__ut_play_ha }, { "rest", 7, _141_pen__ut_rest_a, 0, _141_pen__ut_rest_ha },