urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 11:08:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'goningfix' into test

Browse Source
This commit is contained in:
Philip C Monk 2015-06-02 21:25:16 -04:00
commit f770556baf
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
base/arvo/clay.hoon
View File

@ -2766,8 +2766,10 @@
:: ~& >> [pax %ank-kan-sig] :: ~& >> [pax %ank-kan-sig]
~ ~
:: ~& >> [pax %ank-sig] :: ~& >> [pax %ank-sig]
=+ =+ (~(tap by dir.u.kan)) =+ ?~ dir.u.kan
:: ~& [%dirukan pax=pax (~(run by dir.u.kan) (cury test ~))] ~
=+ (~(tap by u.dir.u.kan))
:: ~& [%dirukan pax=pax (~(run by u.dir.u.kan) (cury test ~))]
|- ^- (list (pair path miso)) |- ^- (list (pair path miso))
?~ +< ~ ?~ +< ~
?~ q.i $(+< t) ?~ q.i $(+< t)
@ -2786,16 +2788,18 @@
- -
[[(flop pax) %del q.u.q.u.ank] -] [[(flop pax) %del q.u.q.u.ank] -]
:: ~& >> [pax %neither-sig] :: ~& >> [pax %neither-sig]
=+ %+ weld =+ ?~ dir.u.kan
~
%+ weld
=+ (~(tap by r.u.ank)) =+ (~(tap by r.u.ank))
|- ^- (list ,[p=path q=miso]) |- ^- (list ,[p=path q=miso])
?~ +< ~ ?~ +< ~
=+ (~(get by dir.u.kan) p.i) =+ (~(get by u.dir.u.kan) p.i)
?: ?=([~ ~] -) $(+< t) ?: ?=([~ ~] -) $(+< t)
%- weld :_ $(+< t) %- weld :_ $(+< t)
:: ~& >> [pax %ankhing p.i ?=(~ -)] :: ~& >> [pax %ankhing p.i ?=(~ -)]
^$(pax [p.i pax], ank `q.i, kan ?~(- ~ `u.u.-)) ^$(pax [p.i pax], ank `q.i, kan ?~(- ~ `u.u.-))
=+ (~(tap by dir.u.kan)) =+ (~(tap by u.dir.u.kan))
:: ~& > [%sdirukan pax=pax (~(run by dir.u.kan) (cury test ~))] :: ~& > [%sdirukan pax=pax (~(run by dir.u.kan) (cury test ~))]
|- ^- (list ,[p=path q=miso]) |- ^- (list ,[p=path q=miso])
?~ +< ~ ?~ +< ~

2
base/arvo/zuse.hoon
View File

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