From 72d8b26b9575ff6738307aa3f55ab45ea349584f Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 12 Jan 2016 15:31:02 -0800 Subject: [PATCH] First tier of jet defrogging. --- jets/f/ut_burn.c | 6 +----- jets/f/ut_crop.c | 12 ++++++------ jets/f/ut_fish.c | 6 +++--- jets/f/ut_fuse.c | 6 +++--- jets/f/ut_peek.c | 6 +++--- jets/f/ut_wrap.c | 6 +++--- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/jets/f/ut_burn.c b/jets/f/ut_burn.c index 5b3d46fc42..ad73795ef6 100644 --- a/jets/f/ut_burn.c +++ b/jets/f/ut_burn.c @@ -52,11 +52,7 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun fop = u3qfu_repo(van, sut); - u3_noun ret = _burn_in(van, fop, gil); - - u3z(fop); - return ret; + return _burn_in(van, u3h(p_sut), gil); } case c3__frog: p_sut = u3t(sut); { diff --git a/jets/f/ut_crop.c b/jets/f/ut_crop.c index bf7c96d774..c38eb2011c 100644 --- a/jets/f/ut_crop.c +++ b/jets/f/ut_crop.c @@ -152,10 +152,10 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun fop = u3qfu_repo(van, sut); - u3_noun ret = _crop_dext(van, fop, ref, bix); + u3_noun yed = u3qdi_tap(p_sut, u3_nul); + u3_noun ret = u3kf_frog(_crop_dext_frog(van, yed, ref, bix)); - u3z(fop); + u3z(yed); return ret; } case c3__frog: p_sut = u3t(sut); @@ -206,10 +206,10 @@ } case c3__fork: p_ref = u3t(ref); { - u3_noun gif = u3qfu_repo(van, ref); - u3_noun ret = _crop_dext(van, sut, gif, bix); + u3_noun yed = u3qdi_tap(p_ref, u3_nul); + u3_noun ret = _crop_sint_frog(van, sut, yed, bix); - u3z(gif); + u3z(yed); return ret; } case c3__frog: p_ref = u3t(ref); diff --git a/jets/f/ut_fish.c b/jets/f/ut_fish.c index 2c52eb68c1..4756dae750 100644 --- a/jets/f/ut_fish.c +++ b/jets/f/ut_fish.c @@ -101,10 +101,10 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun fop = u3qfu_repo(van, sut); - u3_noun ret = _fish_in(van, fop, axe, vit); + u3_noun yed = u3qdi_tap(p_sut, u3_nul); + u3_noun ret = _fish_frog(van, yed, axe, vit); - u3z(fop); + u3z(yed); return ret; } case c3__frog: { diff --git a/jets/f/ut_fuse.c b/jets/f/ut_fuse.c index 5c019ff9d6..d5976e513a 100644 --- a/jets/f/ut_fuse.c +++ b/jets/f/ut_fuse.c @@ -134,10 +134,10 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun fop = u3qfu_repo(van, sut); - u3_noun ret = _fuse_in(van, fop, ref, bix); + u3_noun yed = u3qdi_tap(p_sut, u3_nul); + u3_noun ret = u3kf_frog(_fuse_in_frog(van, yed, ref, bix)); - u3z(fop); + u3z(yed); return ret; } case c3__frog: p_sut = u3t(sut); diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c index b27ac8ea17..ccd7151de9 100644 --- a/jets/f/ut_peek.c +++ b/jets/f/ut_peek.c @@ -114,10 +114,10 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun fop = u3qfu_repo(van, sut); - u3_noun ret = _peek_in(van, fop, way, axe, gil); + u3_noun yed = u3qdi_tap(p_sut, u3_nul); + u3_noun ret = u3kf_frog(_peek_frog(van, yed, way, axe, gil)); - u3z(fop); + u3z(yed); return ret; } case c3__frog: { diff --git a/jets/f/ut_wrap.c b/jets/f/ut_wrap.c index 83f648670c..eda937fdfd 100644 --- a/jets/f/ut_wrap.c +++ b/jets/f/ut_wrap.c @@ -50,10 +50,10 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun fop = u3qfu_repo(van, sut); - u3_noun ret = _cqfu_wrap(van, fop, yoz); + u3_noun yed = u3qdi_tap(p_sut, u3_nul); + u3_noun ret = u3kf_frog(_wrap_frog(van, yed, yoz)); - u3z(fop); + u3z(yed); return ret; } case c3__frog: p_sut = u3t(sut);