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

Merge remote-tracking branch 'origin/test' into pending

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2015-07-14 18:56:05 -04:00
commit 9571a2b434
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arvo/ames.hoon
View File

@ -413,7 +413,7 @@
vix=(bex +((cut 0 [25 2] mag))) :: width of sender
tay=(cut 0 [27 5] mag) :: message type
==
?> =(1 vez)
?> =(2 vez)
?> =(chk (end 0 20 (mug bod)))
:+ [(end 3 wix bod) (cut 3 [wix vix] bod)]
(kins tay)
@ -433,7 +433,7 @@
=+ tay=(ksin q.kec)
%+ mix
%+ can 0
:~ [3 1]
:~ [3 2]
[20 (mug bod)]
[2 yax]
[2 qax]
@ -1018,7 +1018,7 @@
++ gnaw :: gnaw:am
|= [kay=cape ryn=lane pac=rock] :: process packet
^- [p=(list boon) q=fort]
?. =(1 (end 0 3 pac)) [~ fox]
?. =(2 (end 0 3 pac)) [~ fox]
=+ kec=(bite pac)
?: (goop p.p.kec) [~ fox]
?. (~(has by urb.ton.fox) q.p.kec)

17
arvo/eyre.hoon
View File

@ -44,7 +44,7 @@
== == ::
$: %f :: by %ford
$% [%made p=@uvH q=gage] ::
[%news ~] ::
[%news p=@uvH] ::
== == ::
$: @tas :: by any
$% [%crud p=@tas q=(list tank)] ::
@ -58,7 +58,7 @@
[%hi p=mark ~] :: outbound HTTP
[%si ~] :: response done
[%of p=ixor q=$|(~ whir-of)] :: associated view
[%on p=span:,@uvH ~] :: dependency
[%on ~] :: dependency
== ::
++ whir-of ,[p=span:ship q=term r=wire] :: path in dock
-- ::
@ -99,7 +99,7 @@
++ honk $%([%nice ~] [%mean p=ares]) :: old gall result
++ even :: client event
$% [%mean p=[dock path] q=ares]
[%news p=@uv]
[%news p=@uvH]
[%rush p=[dock path] q=json]
==
::
@ -694,16 +694,15 @@
(give-json 200 ~ (joba %beat %b &))
::
%news :: dependency updated
?. ?=([%on ^] tee)
?. ?=([%on ~] tee)
~&(e/lost/[tee hen] +>.$)
=+ dep=(slav %uv p.tee)
%+ roll (~(tap in (~(get ju liz) dep)))
=< .(con ..axon(liz (~(del by liz) dep)))
%+ roll (~(tap in (~(get ju liz) p.sih)))
=< .(con ..axon(liz (~(del by liz) p.sih)))
|= [sus=(each duct ixor) con=_..axon]
=. ..axon con
?- -.sus
%& (give-json(hen p.sus) 205 ~ %b &)
%| (get-even:(ire-ix p.sus) [%news dep])
%| (get-even:(ire-ix p.sus) +.sih)
==
::
%made
@ -941,7 +940,7 @@
=+ had=(~(has by liz) a)
=. liz (~(put ju liz) a b)
?: had done
(pass-note on//(scot %uv a) %f [%wasp our a])
(pass-note on/~ %f [%wasp our a])
::
++ parse
^- (each perk httr)

8
arvo/ford.hoon
View File

@ -70,7 +70,7 @@
== ::
++ task :: problem in progress
$: nah=duct :: cause
[bek=beak kas=silk] :: problem
[bek=beak kas=silk] :: problem
keg=(map (pair term beam) cage) :: block results
kig=[p=@ud q=(map ,@ud ,[p=care q=beam])] :: blocks
== ::
@ -240,7 +240,7 @@
%sent
=- [[%done ~] +>.$(mow (weld - mow))]
^- (list move)
%+ weld (turn (~(tap in p.dap)) |=(hen=duct [hen %give %news ~]))
%+ weld (turn (~(tap in p.dap)) |=(hen=duct [hen %give %news dep]))
=. q.dap (~(del in q.dap) bem)
%+ turn (~(tap in q.dap)) :: cancel outstanding
|= bem=beam
@ -255,12 +255,12 @@
?~ dep
~&(dep-empty/hen +>.$)
?: =(dep 0vtest) :: upstream testing
+>.$(mow :_(mow [hen %give %news ~]))
+>.$(mow :_(mow [hen %give %news dep]))
=+ dap=(~(get by deh.bay) dep)
?~ dap ~&(dep-missed/dep +>.$) :: XX ~| !!
:: ~& awap/[dep u.dap]
?- -.u.dap
%done +>.$(mow :_(mow [hen %give %news ~]))
%done +>.$(mow :_(mow [hen %give %news dep]))
%sent
=. p.u.dap (~(put in p.u.dap) hen)
+>.$(deh.bay (~(put by deh.bay) dep u.dap))

2
arvo/zuse.hoon
View File

@ -2552,7 +2552,7 @@
++ gift-ford :: out result <-$
$% [%made p=@uvH q=gage] :: computed result
[%mass p=mass] :: memory usage
[%news ~] :: fresh depends
[%news p=@uvH] :: fresh depends
== ::
++ kiss-ford :: in request ->$
$% [%exec p=@p q=(unit bilk)] :: make / kill