Merge branch 'master' of https://github.com/urbit/urbit

base/arvo/clay.hoon

@@ -2874,40 +2874,57 @@
   ^-  soba
   :-  *cart
   =|  pax=path
+  ::  =-  ~&  [%khan (turn - |=((pair path miso) [p -.q]))]  -
   |-  ^-  (list ,[p=path q=miso])
   ?~  ank
     ?~  kan
+      ::  ~&  >>  [pax %ank-kan-sig]
       ~
+    ::  ~&  >>  [pax %ank-sig]
     =+  =+  (~(tap by dir.u.kan))
-        |-(?~(+< ~ (weld ^$(pax [p.i pax], kan `q.i) $(+< t))))
+        ::  ~&  [%dirukan pax=pax (~(run by dir.u.kan) (cury test ~))]
+        |-  ^-  (list (pair path miso))
+        ?~  +<  ~
+        ?~  q.i  $(+< t)
+        (weld ^$(pax [p.i pax], kan `u.q.i) $(+< t))
     ?~  fil.u.kan
       -
     ?~  u.fil.u.kan
       -
+    ::  ~&  >>  [pax %ins-1]
     [[(flop pax) %ins u.u.fil.u.kan] -]
   ?~  kan
+    ::  ~&  >>  [pax %kan-sig]
     =+  =+  (~(tap by r.u.ank))
         |-(?~(+< ~ (weld ^$(pax [p.i pax], ank `q.i) $(+< t))))
     ?~  q.u.ank
       -
     [[(flop pax) %del q.u.q.u.ank] -]
+  ::  ~&  >>  [pax %neither-sig]
   =+  %+  weld
         =+  (~(tap by r.u.ank))
         |-  ^-  (list ,[p=path q=miso])
         ?~  +<  ~
+        =+  (~(get by dir.u.kan) p.i)
+        ?:  ?=([~ ~] -)  $(+< t)
         %-  weld  :_  $(+< t)
-        ^$(pax [p.i pax], ank `q.i, kan (~(get by dir.u.kan) p.i))
+        ::  ~&  >>  [pax %ankhing p.i ?=(~ -)]
+        ^$(pax [p.i pax], ank `q.i, kan ?~(- ~ `u.u.-))
       =+  (~(tap by dir.u.kan))
+      ::  ~&  >  [%sdirukan pax=pax (~(run by dir.u.kan) (cury test ~))]
       |-  ^-  (list ,[p=path q=miso])
       ?~  +<  ~
+      ?~  q.i  $(+< t)
       ?:  (~(has by r.u.ank) p.i)  $(+< t)
+      ::  ~&  >>  [pax %khaning p.i]
       %-  weld  :_  $(+< t)
-      ^$(pax [p.i pax], kan `q.i, ank ~)
+      ^$(pax [p.i pax], kan `u.q.i, ank ~)
   ?~  q.u.ank
     ?~  fil.u.kan
       -
     ?~  u.fil.u.kan
       -
+    ::  ~&  %ins-2
     [[(flop pax) %ins u.u.fil.u.kan] -]
   ?~  fil.u.kan
     -

base/arvo/time.hoon

@@ -29,6 +29,7 @@
 ++  raze
   |=  tym=[p=clok q=clok]
   ^+  tym
+  ?~  p.tym  tym
   ?~  q.tym  tym
   ?:  (gth p:~(get up p.tym) p:~(get up q.tym))         ::  killed nonexisting
     ~&  [%snooze-lost del=p:~(get up q.tym) top=p:~(get up p.tym)]
@@ -182,6 +183,8 @@
       |-  ^+  [*(list move) tym]
       =.  tym  (raze tym)
       ?:  =([~ ~] tym)  [~ tym]                         ::  XX  TMI
+      ?:  =(~ p.tym)
+        ~&  %weird-wake  [~ tym]
       =+  nex=~(get up p.tym)
       ?:  (lte now p.nex)  [~ tym]
       =^  mof  tym  $(p.tym ~(pop up p.tym))

base/arvo/zuse.hoon

@@ -2295,7 +2295,7 @@
   ::
 ++  khan                                                ::
           $:  fil=(unit (unit cage))                    ::  XX see khan-to-soba
-              dir=(map ,@ta khan)                       ::
+              dir=(map ,@ta (unit khan))                ::
           ==                                            ::
 ++  mick  (list ,[path (unit mime)])
 ++  riff  ,[p=desk q=(unit rave)]                       ::  request/desist