From 02593d6f28234888410e1c20ff8f0294cdbf14dd Mon Sep 17 00:00:00 2001
From: Joseph Bryan <joemfb@gmail.com>
Date: Tue, 14 Feb 2017 15:34:40 -0500
Subject: [PATCH] removes +-rap:to accumulator arg and changes calling
 convention

---
 sys/hoon.hoon      |  4 ++--
 sys/vane/ames.hoon | 10 +++++-----
 sys/vane/xmas.hoon | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/hoon.hoon b/sys/hoon.hoon
index 801a1d05e..f7ebb6793 100644
--- a/sys/hoon.hoon
+++ b/sys/hoon.hoon
@@ -1510,9 +1510,9 @@
     bal(a a(l $(a l.a)))
   ::
   +-  tap                                               ::  adds list to end
-    |=  b/(list _?>(?=(^ a) n.a))
+    =|  b/(list _?>(?=(^ a) n.a))
+    |-  ^+  b
     =+  0                                               ::  hack for jet match
-    ^+  b
     ?~  a
       b
     $(a r.a, b [n.a $(a l.a)])
diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon
index 4de22981b..fa8a82fcc 100644
--- a/sys/vane/ames.hoon
+++ b/sys/vane/ames.hoon
@@ -370,10 +370,10 @@
     ++  aver                                            ::  verify
       ?>  (lte cur.saw max.saw)
       ?>  !=(0 max.saw)
-      ?.  =(cur.saw (lent (~(tap to liv))))
-        ~&  [%aver-cur cur.saw (lent (~(tap to liv)))]
+      ?.  =(cur.saw (lent ~(tap to liv)))
+        ~&  [%aver-cur cur.saw (lent ~(tap to liv))]
         !!
-      ?>  =(rey.saw (lent (~(tap to lop))))
+      ?>  =(rey.saw (lent ~(tap to lop)))
       ?>  =+  |=  {a/coal b/coal}
               &((lth out.a out.b) (lth lod.a lod.b))
           |-  ?|  ?=($~ liv)
@@ -432,7 +432,7 @@
           [& $(liv l.liv)]
       ?~  ack  [~ ~ liv]
       =.  ded  ?:(top [n.liv ded] ded)
-      =.  ded  ?:(vig.clu.u.ack (~(tap to r.liv) ded) ded)
+      =?  ded  vig.clu.u.ack  (weld ~(tap to r.liv) ded)
       =.  lov  ?:(top [n.liv lov ~] lov)
       [ack ded lov]
     ::                                                  ::
@@ -512,7 +512,7 @@
         ::
         ::  everything in front of a dead packet is dead
         ::
-        $(liv l.liv, ded (~(tap to r.liv) [n.liv ded]))
+        $(liv l.liv, ded (welp ~(tap to r.liv) [n.liv ded]))
       =+  ryt=$(liv r.liv)
       [p.ryt [n.liv l.liv q.ryt]]
     ::                                                  ::
diff --git a/sys/vane/xmas.hoon b/sys/vane/xmas.hoon
index 6ec94c0ed..b0515d7c7 100644
--- a/sys/vane/xmas.hoon
+++ b/sys/vane/xmas.hoon
@@ -709,10 +709,10 @@
     ++  aver                                            ::  verify
       ?>  (lte cur.saw max.saw)
       ?>  !=(0 max.saw)
-      ?.  =(cur.saw (lent (~(tap to liv))))
-        ~&  [%aver-cur cur.saw (lent (~(tap to liv)))]
+      ?.  =(cur.saw (lent ~(tap to liv)))
+        ~&  [%aver-cur cur.saw (lent ~(tap to liv))]
         !!
-      ?>  =(rey.saw (lent (~(tap to lop))))
+      ?>  =(rey.saw (lent ~(tap to lop)))
       ?>  =+  |=  {a/coal b/coal}
               &((lth out.a out.b) (lth lod.a lod.b))
           |-  ?|  ?=($~ liv)
@@ -771,7 +771,7 @@
           [& $(liv l.liv)]
       ?~  ack  [~ ~ liv]
       =.  ded  ?:(top [n.liv ded] ded)
-      =.  ded  ?:(vig.clu.u.ack (~(tap to r.liv) ded) ded)
+      =?  ded  vig.clu.u.ack  (weld ~(tap to r.liv) ded)
       =.  lov  ?:(top [n.liv lov ~] lov)
       [ack ded lov]
     ::                                                  ::
@@ -851,7 +851,7 @@
         ::
         ::  everything in front of a dead packet is dead
         ::
-        $(liv l.liv, ded (~(tap to r.liv) [n.liv ded]))
+        $(liv l.liv, ded (welp ~(tap to r.liv) [n.liv ded]))
       =+  ryt=$(liv r.liv)
       [p.ryt [n.liv l.liv q.ryt]]
     ::                                                  ::