From 404b8cedf7fa1fa01edb3f791ad0a21a46593901 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Fri, 6 Mar 2015 17:15:51 -0800
Subject: [PATCH] %-  stack trace annotation

---
 arvo/hoon.hoon | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index 17010aab1..2e90c7386 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -2083,8 +2083,8 @@
   ::
   +-  get                                               ::  grab value by key
     ~/  %get
-    |*  b=*
-    |-  ^-  ?(~ [~ u=_?>(?=(^ a) q.n.a)])
+    |=  b=*
+    ^-  $|(~ [~ u=_?>(?=(^ a) q.n.a)])
     ?~  a
       ~
     ?:  =(b p.n.a)
@@ -6131,7 +6131,12 @@
       [i.p.gen $(p.gen t.p.gen)]
     ::
         [%cncb *]  [%ktls [%cnzz p.gen] %cnts p.gen q.gen]
-        [%cncl *]  [%cnsg [%$ ~] p.gen q.gen]
+        [%cncl *]  
+      =+  rem=[%cnsg [%$ ~] p.gen q.gen]
+      ?.  ?=([%zpcb ^ %cnzz @ ~] p.gen)  rem
+      =>  .(p.gen `[@ ^ @ p=@tas ~]`p.gen)
+      :+  %sgzp  [[%dtzz %tas 'slam'] [%dtzz %tas p.p.gen]]
+      rem
         [%cndt *]  [%cnhp q.gen [p.gen ~]]
         [%cnkt *]  [%cnhp p.gen q.gen r.gen s.gen ~]
         [%cnls *]  [%cnhp p.gen q.gen r.gen ~]