From e872e068afc2846bd77aeb4f538cb99e8fd63cdd Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Wed, 13 Jan 2016 17:46:01 -0800
Subject: [PATCH] Stash commit; in middle of debugging nest bug.

---
 ape/dojo.hoon  |  2 +-
 ape/talk.hoon  |  8 ++++--
 arvo/hoon.hoon | 78 +++++++++++++++++++++++++-------------------------
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/ape/dojo.hoon b/ape/dojo.hoon
index 0ea3f4717..897a622f2 100644
--- a/ape/dojo.hoon
+++ b/ape/dojo.hoon
@@ -752,7 +752,7 @@
     |=  txt/tape                                        ::
     ^-  (each (unit (each dojo-command tape)) hair)     ::  prefix+result
     =+  len=+((lent txt))                               ::  line length
-    =.  txt  :(weld buf txt "\0a")                      ::
+    =.  txt  (weld buf `tape`(weld txt "\0a"))          ::
     =+  vex=((full dp-command-line):dp [1 1] txt)       ::
     ?:  =(q.p.vex len)                                  ::  matched to line end
       [%& ~]                                            ::
diff --git a/ape/talk.hoon b/ape/talk.hoon
index 5df853220..812b2dad3 100644
--- a/ape/talk.hoon
+++ b/ape/talk.hoon
@@ -973,9 +973,11 @@
         =<  (sh-fact %mor (turn pan .))
         |=(a/(set partner) [%txt <a>]) ::  XX ~(te-whom te man.she a)
       ::
-      ++  who                                          ::  %who
-        |=  pan/(set partner)  ^+  ..sh-work
-        =<  (sh-fact %mor (murn (sort (~(tap by q.owners.she)) aor) .))
+      ++  who                                          ::  %who  
+        |=  pan/(set partner)  ^+  ..sh-work  
+        =+  foo=`(list (pair partner atlas))`(~(tap by q.owners.she))
+        =+  bar=`(list (pair partner atlas))`(sort foo aor)
+        =<  (sh-fact %mor (murn (sort (~(tap by q.owners.she) ~) aor) .))
         |=  {pon/partner alt/atlas}  ^-  (unit sole-effect)
         ?.  |(=(~ pan) (~(has in pan) pon))  ~
         =-  `[%tan rose+[", " `~]^- leaf+~(ta-full ta man.she pon) ~]
diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index ff72fe962..1f2fb8f8f 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -7656,8 +7656,8 @@
     =-  [p.tez (doge q.p.tez q.tez)]
     ^=  tez
     ^-  {p/{p/(map span @) q/(map @ wine)} q/wine}
-    ?:  (~(meet ut sut) -:!>(*span))
-      [dex %span]
+    ::  ?:  (~(meet ut sut) -:!>(*span))
+    ::    [dex %span]
     ?-    sut
         $noun      [dex sut]
         $void      [dex sut]
@@ -7784,50 +7784,50 @@
       ==
   =+  sut=`span`%noun
   |%
-  ++  burn
-    =+  gil=*(set span)
-    |-  ^-  *
-    ?-    sut
-        {$atom *}   ?~(q.sut 0 u.q.sut)
-        {$cell *}   [$(sut p.sut) $(sut q.sut)]
-        {$core *}   [p.r.q.sut $(sut p.sut)]
-        {$face *}   $(sut repo)
-        {$fork *}   $(sut -.p.sut)
-        {$frog *}   $(sut -.p.sut)
-        {$hold *}   ?:  (~(has in gil) sut)
-                      ~_  (dunk %span)
-                      ~|(%burn-loop !!)
-                    $(sut repo, gil (~(put in gil) sut))
-        $noun       0
-        $void       ~|(%burn-void !!)
-    ==
 ::++  burn
 ::  =+  gil=*(set span)
-::  ~|  %burn
-::  %-  need
-::  |-  ^-  (unit)
+::  |-  ^-  *
 ::  ?-    sut
-::      {$atom *}   `?~(q.sut 0 u.q.sut)
-::      {$cell *}   %+  biff  $(sut p.sut) 
-::                  |=(* (biff ^$(sut q.sut) |=(* `[+>+< +<])))
-::      {$core *}   (biff $(sut p.sut) |=(* `[p.r.q.sut +<]))
+::      {$atom *}   ?~(q.sut 0 u.q.sut)
+::      {$cell *}   [$(sut p.sut) $(sut q.sut)]
+::      {$core *}   [p.r.q.sut $(sut p.sut)]
 ::      {$face *}   $(sut repo)
-::      {$fork *}   =+  yed=(~(tap in p.sut))
-::                  |-  ^-  (unit) 
-::                  ?~  yed  ~
-::                  =+  [dis=^$(sut i.yed) mor=$(yed t.yed)]
-::                  ?~  dis  mor
-::                  ?~  mor  dis
-::                  ?:  =(.?(u.mor) .?(u.dis))
-::                    ?:((gor u.mor u.dis) mor dis)
-::                  ?@(u.mor mor dis)
+::      {$fork *}   $(sut -.p.sut)
 ::      {$frog *}   $(sut -.p.sut)
 ::      {$hold *}   ?:  (~(has in gil) sut)
-::                    ~
+::                    ~_  (dunk %span)
+::                    ~|(%burn-loop !!)
 ::                  $(sut repo, gil (~(put in gil) sut))
-::      $noun       `0
-::      $void       ~
-::  ==
+::      $noun       0
+::      $void       ~|(%burn-void !!)
+::  ==  
+  ++  burn
+    =+  gil=*(set span)
+    ~|  %burn
+    %-  need
+    |-  ^-  (unit)
+    ?-    sut
+        {$atom *}   `?~(q.sut 0 u.q.sut)
+        {$cell *}   %+  biff  $(sut p.sut) 
+                    |=(* (biff ^$(sut q.sut) |=(* `[+>+< +<])))
+        {$core *}   (biff $(sut p.sut) |=(* `[p.r.q.sut +<]))
+        {$face *}   $(sut repo)
+        {$fork *}   =+  yed=(~(tap in p.sut))
+                    |-  ^-  (unit) 
+                    ?~  yed  ~
+                    =+  [dis=^$(sut i.yed) mor=$(yed t.yed)]
+                    ?~  dis  mor
+                    ?~  mor  dis
+                    ?:  =(.?(u.mor) .?(u.dis))
+                      ?:((gor u.mor u.dis) mor dis)
+                    ?@(u.mor mor dis)
+        {$frog *}   $(sut -.p.sut)
+        {$hold *}   ?:  (~(has in gil) sut)
+                      ~
+                    $(sut repo, gil (~(put in gil) sut))
+        $noun       `0
+        $void       ~
+    ==
   ::
   ++  busk
     ~/  %busk