From df9134cc6023fa14b83811bb62ff1e5a89dd0fa9 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Thu, 11 Aug 2016 17:46:51 -0700
Subject: [PATCH 1/3] use compiler cache in ++ap-slam check

---
 arvo/gall.hoon | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index 4294050e8..ba6d91f1a 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -1178,6 +1178,8 @@
       |=  {cog/term gat/vase arg/vase}
       ^-  {(each vase tang) _+>}
       =+  ^=  wyz  %-  mule  |.
+          =^  gud  vel  (~(nest wa vel) p:(slot 6 gat) p.arg)
+          ?.  gud  ~|(%nest !!)
           (~(play wa vel) [%cell p.gat p.arg] [%open [%$ ~] [%$ 2] [%$ 3] ~])
       ?:  ?=($| -.wyz)
         %-  =+  sam=(~(peek ut p.gat) %free 6)

From 64cf7698cf159d7d5107127ba8ec04a12a2584e4 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Mon, 22 Aug 2016 14:48:05 -0700
Subject: [PATCH 2/3] use mint instead of slot, nest, play

I think the slowness was in the slot, in per-road compiler cache; at any rate, fixed now
---
 arvo/gall.hoon | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index ba6d91f1a..2f4abd2b8 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -1178,17 +1178,16 @@
       |=  {cog/term gat/vase arg/vase}
       ^-  {(each vase tang) _+>}
       =+  ^=  wyz  %-  mule  |.
-          =^  gud  vel  (~(nest wa vel) p:(slot 6 gat) p.arg)
-          ?.  gud  ~|(%nest !!)
-          (~(play wa vel) [%cell p.gat p.arg] [%open [%$ ~] [%$ 2] [%$ 3] ~])
+          (~(mint wa vel) [%cell p.gat p.arg] [%open [%$ ~] [%$ 2] [%$ 3] ~])
       ?:  ?=($| -.wyz)
         %-  =+  sam=(~(peek ut p.gat) %free 6)
             (slog >%ap-slam-mismatch< ~(duck ut p.arg) ~(duck ut sam) ~)
         :_(+>.$ [%| (ap-suck "call: {<cog>}: type mismatch")])
       :_  +>.$(vel +>.wyz)
-      =+  ton=(mong [q.gat q.arg] ap-sled)
+      =+  [typ nok]=+<.wyz
+      =+  ton=(mock [[q.gat q.arg] nok] ap-sled)
       ?-  -.ton
-        $0  [%& +<.wyz p.ton]
+        $0  [%& typ p.ton]
         $1  [%| (turn p.ton |=(a/* (smyt (path a))))]
         $2  [%| p.ton]
       ==

From 9058ca8a94eedbc25fec8a22339959fedf69eb49 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Mon, 24 Oct 2016 14:14:40 -0700
Subject: [PATCH 3/3] print offending path in "blocking not beam" error

---
 arvo/ford.hoon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arvo/ford.hoon b/arvo/ford.hoon
index 1bc76785c..eaad733b1 100644
--- a/arvo/ford.hoon
+++ b/arvo/ford.hoon
@@ -450,10 +450,10 @@
             ?~  pax  (err "blocking empty")
             =+  ren=((soft care) (rsh 3 1 i.pax))
             ?~  ren
-              (err "blocking not care")
+              (err "blocking not care: {<i.pax>}")
             =+  zis=(tome t.pax)
             ?~  zis
-              (err "blocking not beam")
+              (err "blocking not beam: {<t.pax>}")
             ?:  ?=($g (end 3 1 i.pax))
               ?-  -.nex
                 $&  [%& [%g u.ren u.zis] p.nex]