removes accumulator arg from in_tap jet

This commit is contained in:
Joseph Bryan 2017-03-20 18:02:17 -04:00
parent cee04c794b
commit 9bbeed0ef8
13 changed files with 25 additions and 27 deletions

View File

@ -68,7 +68,7 @@
/* u3kdi_tap(): map/set convert to list. (solves by_tap also.) /* u3kdi_tap(): map/set convert to list. (solves by_tap also.)
*/ */
u3_noun u3_noun
u3kdi_tap(u3_noun a, u3_noun b); u3kdi_tap(u3_noun a);
/* u3kdi_put(): put in set. /* u3kdi_put(): put in set.
*/ */
@ -80,7 +80,7 @@
u3_noun u3_noun
u3kdi_uni(u3_noun a, u3_noun b); u3kdi_uni(u3_noun a, u3_noun b);
# define u3kdb_tap(a, b) u3kdi_tap(a, b) # define u3kdb_tap(a) u3kdi_tap(a)
/* u3ke: tier 5 functions /* u3ke: tier 5 functions
*/ */

View File

@ -88,7 +88,7 @@
u3_noun u3qdi_int(u3_noun, u3_noun); u3_noun u3qdi_int(u3_noun, u3_noun);
u3_noun u3qdi_mer(u3_noun, u3_noun); u3_noun u3qdi_mer(u3_noun, u3_noun);
u3_noun u3qdi_put(u3_noun, u3_noun); u3_noun u3qdi_put(u3_noun, u3_noun);
u3_noun u3qdi_tap(u3_noun, u3_noun); u3_noun u3qdi_tap(u3_noun);
u3_noun u3qdi_uni(u3_noun, u3_noun); u3_noun u3qdi_uni(u3_noun, u3_noun);
u3_noun u3qdi_wyt(u3_noun); u3_noun u3qdi_wyt(u3_noun);

View File

@ -27,31 +27,29 @@
} }
u3_noun u3_noun
u3qdi_tap(u3_noun a, u3qdi_tap(u3_noun a)
u3_noun b)
{ {
return _tap_in(a, u3k(b)); return _tap_in(a, u3_nul);
} }
u3_noun u3_noun
u3wdi_tap(u3_noun cor) u3wdi_tap(u3_noun cor)
{ {
u3_noun a, b; u3_noun a;
if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { if ( c3n == u3r_mean(cor, u3x_con_sam, &a, 0) ) {
return u3m_bail(c3__exit); return u3m_bail(c3__exit);
} else { } else {
return u3qdi_tap(a, b); return u3qdi_tap(a);
} }
} }
u3_noun u3_noun
u3kdi_tap(u3_noun a, u3kdi_tap(u3_noun a)
u3_noun b)
{ {
u3_weak c = u3qdi_tap(a, b); u3_weak b = u3qdi_tap(a);
u3z(a); u3z(b); u3z(a);
if ( u3_none == c ) { if ( u3_none == b ) {
return u3m_bail(c3__exit); return u3m_bail(c3__exit);
} }
else return c; else return b;
} }

View File

@ -119,7 +119,7 @@
} }
case c3__fork: p_sut = u3t(sut); case c3__fork: p_sut = u3t(sut);
{ {
u3_noun yed = u3qdi_tap(p_sut, u3_nul); u3_noun yed = u3qdi_tap(p_sut);
u3_noun ret = _burn_fork(van, yed, gil); u3_noun ret = _burn_fork(van, yed, gil);
u3z(yed); u3z(yed);

View File

@ -152,7 +152,7 @@
} }
case c3__fork: p_sut = u3t(sut); case c3__fork: p_sut = u3t(sut);
{ {
u3_noun yed = u3qdi_tap(p_sut, u3_nul); u3_noun yed = u3qdi_tap(p_sut);
u3_noun ret = u3kf_fork(_crop_dext_fork(van, yed, ref, bix)); u3_noun ret = u3kf_fork(_crop_dext_fork(van, yed, ref, bix));
u3z(yed); u3z(yed);
@ -202,7 +202,7 @@
} }
case c3__fork: p_ref = u3t(ref); case c3__fork: p_ref = u3t(ref);
{ {
u3_noun yed = u3qdi_tap(p_ref, u3_nul); u3_noun yed = u3qdi_tap(p_ref);
u3_noun ret = _crop_sint_fork(van, sut, yed, bix); u3_noun ret = _crop_sint_fork(van, sut, yed, bix);
u3z(yed); u3z(yed);

View File

@ -385,7 +385,7 @@
u3_noun gil) u3_noun gil)
{ {
u3_noun p_sut = u3t(sut); u3_noun p_sut = u3t(sut);
u3_noun yed = u3qdi_tap(p_sut, u3_nul); u3_noun yed = u3qdi_tap(p_sut);
u3_noun wiz; u3_noun wiz;
u3_noun ret; u3_noun ret;

View File

@ -101,7 +101,7 @@
} }
case c3__fork: p_sut = u3t(sut); case c3__fork: p_sut = u3t(sut);
{ {
u3_noun yed = u3qdi_tap(p_sut, u3_nul); u3_noun yed = u3qdi_tap(p_sut);
u3_noun ret = _fish_fork(van, yed, axe, vit); u3_noun ret = _fish_fork(van, yed, axe, vit);
u3z(yed); u3z(yed);

View File

@ -134,7 +134,7 @@
} }
case c3__fork: p_sut = u3t(sut); case c3__fork: p_sut = u3t(sut);
{ {
u3_noun yed = u3qdi_tap(p_sut, u3_nul); u3_noun yed = u3qdi_tap(p_sut);
u3_noun ret = u3kf_fork(_fuse_in_fork(van, yed, ref, bix)); u3_noun ret = u3kf_fork(_fuse_in_fork(van, yed, ref, bix));
u3z(yed); u3z(yed);

View File

@ -271,7 +271,7 @@
} }
{ {
u3_noun dey = u3qdi_tap(p_sut, u3_nul); u3_noun dey = u3qdi_tap(p_sut);
u3_noun yed = dey; u3_noun yed = dey;
while ( u3_nul != yed ) { while ( u3_nul != yed ) {
@ -418,7 +418,7 @@
} }
case c3__fork: p_ref = u3t(ref); case c3__fork: p_ref = u3t(ref);
{ {
u3_noun dey = u3qdi_tap(p_ref, u3_nul); u3_noun dey = u3qdi_tap(p_ref);
u3_noun yed = dey; u3_noun yed = dey;
while ( u3_nul != yed ) { while ( u3_nul != yed ) {

View File

@ -137,7 +137,7 @@
} }
case c3__fork: p_sut = u3t(sut); case c3__fork: p_sut = u3t(sut);
{ {
u3_noun yed = u3qdi_tap(p_sut, u3_nul); u3_noun yed = u3qdi_tap(p_sut);
u3_noun ret = u3kf_fork(_peek_fork(van, yed, way, axe, gil)); u3_noun ret = u3kf_fork(_peek_fork(van, yed, way, axe, gil));
u3z(yed); u3z(yed);

View File

@ -26,7 +26,7 @@
u3_noun gar) u3_noun gar)
{ {
u3_noun gun = u3qdi_gas(u3_nul, gar); u3_noun gun = u3qdi_gas(u3_nul, gar);
u3_noun yed = u3qdi_tap(gun, u3_nul); u3_noun yed = u3qdi_tap(gun);
u3z(gun); u3z(gun);
return yed; return yed;

View File

@ -50,7 +50,7 @@
} }
case c3__fork: p_sut = u3t(sut); case c3__fork: p_sut = u3t(sut);
{ {
u3_noun yed = u3qdi_tap(p_sut, u3_nul); u3_noun yed = u3qdi_tap(p_sut);
u3_noun ret = u3kf_fork(_wrap_fork(van, yed, yoz)); u3_noun ret = u3kf_fork(_wrap_fork(van, yed, yoz));
u3z(yed); u3z(yed);

View File

@ -311,7 +311,7 @@ _inode_load(u3_fnod* nod_u)
if ( u3_nul == u3h(ark) ) { if ( u3_nul == u3h(ark) ) {
nod_u->typ_e = u3_fuse_type_directory; nod_u->typ_e = u3_fuse_type_directory;
nod_u->dir_u = _inode_fill_directory nod_u->dir_u = _inode_fill_directory
(nod_u, u3qdb_tap(u3t(ark), u3_nul)); (nod_u, u3qdb_tap(u3t(ark)));
} }
else { else {
u3_noun dat; u3_noun dat;