From 9bbeed0ef8eedbc55dd142750d9a19c7d91e5d71 Mon Sep 17 00:00:00 2001
From: Joseph Bryan <joemfb@gmail.com>
Date: Mon, 20 Mar 2017 18:02:17 -0400
Subject: [PATCH] removes accumulator arg from in_tap jet

---
 include/jets/k.h |  4 ++--
 include/jets/q.h |  2 +-
 jets/d/in_tap.c  | 22 ++++++++++------------
 jets/f/ut_burn.c |  2 +-
 jets/f/ut_crop.c |  4 ++--
 jets/f/ut_find.c |  2 +-
 jets/f/ut_fish.c |  2 +-
 jets/f/ut_fuse.c |  2 +-
 jets/f/ut_nest.c |  4 ++--
 jets/f/ut_peek.c |  2 +-
 jets/f/ut_rest.c |  2 +-
 jets/f/ut_wrap.c |  2 +-
 vere/fuse.c      |  2 +-
 13 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/include/jets/k.h b/include/jets/k.h
index 372e2ba233..6b288a1c42 100644
--- a/include/jets/k.h
+++ b/include/jets/k.h
@@ -68,7 +68,7 @@
   /* u3kdi_tap(): map/set convert to list.  (solves by_tap also.)
   */
     u3_noun
-    u3kdi_tap(u3_noun a, u3_noun b);
+    u3kdi_tap(u3_noun a);
 
   /* u3kdi_put(): put in set.
   */
@@ -80,7 +80,7 @@
     u3_noun 
     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
 */
diff --git a/include/jets/q.h b/include/jets/q.h
index e3c3b3a845..4769c4dc39 100644
--- a/include/jets/q.h
+++ b/include/jets/q.h
@@ -88,7 +88,7 @@
     u3_noun u3qdi_int(u3_noun, u3_noun);
     u3_noun u3qdi_mer(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_wyt(u3_noun);
 
diff --git a/jets/d/in_tap.c b/jets/d/in_tap.c
index c31fdff778..f82d5e4a0e 100644
--- a/jets/d/in_tap.c
+++ b/jets/d/in_tap.c
@@ -27,31 +27,29 @@
   }
 
   u3_noun
-  u3qdi_tap(u3_noun a,
-            u3_noun b)
+  u3qdi_tap(u3_noun a)
   {
-    return _tap_in(a, u3k(b));
+    return _tap_in(a, u3_nul);
   }
   u3_noun
   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);
     } else {
-      return u3qdi_tap(a, b);
+      return u3qdi_tap(a);
     }
   }
   u3_noun
-  u3kdi_tap(u3_noun a,
-            u3_noun b)
+  u3kdi_tap(u3_noun a)
   {
-    u3_weak c = u3qdi_tap(a, b);
+    u3_weak b = u3qdi_tap(a);
 
-    u3z(a); u3z(b);
-    if ( u3_none == c ) {
+    u3z(a);
+    if ( u3_none == b ) {
       return u3m_bail(c3__exit);
     }
-    else return c;
+    else return b;
   }
diff --git a/jets/f/ut_burn.c b/jets/f/ut_burn.c
index 2af7d4b481..f993f379df 100644
--- a/jets/f/ut_burn.c
+++ b/jets/f/ut_burn.c
@@ -119,7 +119,7 @@
       }
       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);
 
         u3z(yed);
diff --git a/jets/f/ut_crop.c b/jets/f/ut_crop.c
index 8aaa65089d..5df045c368 100644
--- a/jets/f/ut_crop.c
+++ b/jets/f/ut_crop.c
@@ -152,7 +152,7 @@
       }
       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));
 
         u3z(yed);
@@ -202,7 +202,7 @@
       }
       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);
 
         u3z(yed);
diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c
index ebc1a4ae0e..67c6f2b04f 100644
--- a/jets/f/ut_find.c
+++ b/jets/f/ut_find.c
@@ -385,7 +385,7 @@
                   u3_noun gil)
   {
     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 ret;
 
diff --git a/jets/f/ut_fish.c b/jets/f/ut_fish.c
index 7d3f1cf6ad..d16f5aaec5 100644
--- a/jets/f/ut_fish.c
+++ b/jets/f/ut_fish.c
@@ -101,7 +101,7 @@
       }
       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);
 
         u3z(yed);
diff --git a/jets/f/ut_fuse.c b/jets/f/ut_fuse.c
index 7ea0733862..e833fc6a02 100644
--- a/jets/f/ut_fuse.c
+++ b/jets/f/ut_fuse.c
@@ -134,7 +134,7 @@
       }
       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));
 
         u3z(yed);
diff --git a/jets/f/ut_nest.c b/jets/f/ut_nest.c
index 897adacae6..16c055848b 100644
--- a/jets/f/ut_nest.c
+++ b/jets/f/ut_nest.c
@@ -271,7 +271,7 @@
         }
 
         {
-          u3_noun dey = u3qdi_tap(p_sut, u3_nul);
+          u3_noun dey = u3qdi_tap(p_sut);
           u3_noun yed = dey;
 
           while ( u3_nul != yed ) {
@@ -418,7 +418,7 @@
         }
         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;
 
           while ( u3_nul != yed ) {
diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c
index d476d25c29..5ebe931244 100644
--- a/jets/f/ut_peek.c
+++ b/jets/f/ut_peek.c
@@ -137,7 +137,7 @@
       }
       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));
 
         u3z(yed);
diff --git a/jets/f/ut_rest.c b/jets/f/ut_rest.c
index 15c93d59e1..c8c3d5c498 100644
--- a/jets/f/ut_rest.c
+++ b/jets/f/ut_rest.c
@@ -26,7 +26,7 @@
                 u3_noun 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);
     return yed;
diff --git a/jets/f/ut_wrap.c b/jets/f/ut_wrap.c
index 71e01910e7..7e563565c0 100644
--- a/jets/f/ut_wrap.c
+++ b/jets/f/ut_wrap.c
@@ -50,7 +50,7 @@
       }
       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));
 
         u3z(yed);
diff --git a/vere/fuse.c b/vere/fuse.c
index 7defc1e52a..3396c61b85 100644
--- a/vere/fuse.c
+++ b/vere/fuse.c
@@ -311,7 +311,7 @@ _inode_load(u3_fnod* nod_u)
         if ( u3_nul == u3h(ark) ) {
           nod_u->typ_e = u3_fuse_type_directory;
           nod_u->dir_u = _inode_fill_directory
-            (nod_u, u3qdb_tap(u3t(ark), u3_nul));
+            (nod_u, u3qdb_tap(u3t(ark)));
         }
         else {
           u3_noun dat;