Merge branch 'nextbreach' of https://github.com/urbit/urbit into nextbreach

This commit is contained in:
Gavin Whelan 2014-06-06 18:07:12 -04:00
commit d221f092cb
3 changed files with 19 additions and 6 deletions

View File

@ -39,6 +39,7 @@
== ::
++ sign :: in result $-<
$% [%crud p=@tas q=(list tank)] :: by any
[%send p=lane q=@] :: transmit packet
[%went p=ship q=cape] :: by %ames
== ::
--
@ -1666,8 +1667,11 @@
++ knap
|= [tea=wire hen=duct sin=sign]
^- [(list move) _+>]
?> ?=([%crud *] sin)
[[[hen [%slip %d %flog sin]] ~] +>]
?- -.sin
%crud [[[hen [%slip %d %flog sin]] ~] +>]
%send [[hen %give sin]~ +>]
%went [~ +>]
==
::
++ knob
|= [hen=duct kyz=kiss]

View File

@ -44,7 +44,7 @@
== ::
++ move ,[p=duct q=(mold newt ghat)] :: local move
++ newt :: out request $->
$% ::
$% [%cash p=@p q=buck] :: civil license
[%band p=ship q=(list rout)] :: to %eyre
[%flog p=flog] :: to %dill
[%hail ~] :: to %batz
@ -246,7 +246,7 @@
?- -.sin
%crud [[[hen [%slip %d %flog sin]] ~] +<.^^$]
%hail [[[hen %give sin] ~] +<.^^$]
%helo [[[hen %give sin] ~] +<.^^$]
%helo [~ +<.^^$]
%init [[[hen %give sin] ~] +<.^^$]
%note [[[hen %give sin] ~] +<.^^$]
%pipe !!
@ -1421,6 +1421,15 @@
..^$(dez (~(put by dez) hen [[p.q.hin (bard p.q.hin)] ~]))
==
?> ?=(^ u.dus)
?: ?=(%init -.q.hin)
=+ bos=(sein p.q.hin)
:- :* [hen %give q.hin]
[[[%b ~] hen] [%sick %hail ~]]
?: =(bos p.q.hin) ~
:_ ~
[[/b hen] [%sick %line (rap 3 ":{(scow %p bos)}/main=/bin/update")]]
==
..^$(dez (~(put by dez) hen [[p.q.hin (bard p.q.hin)] u.dus]))
=+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus]
=+ yub=(leap:((be beg) now eny sky) tea hen q.hin)
:- p.yub

View File

@ -1324,11 +1324,11 @@
:: =+ a4=(rnd p (rsh 0 e2 a3))
=+ a4=(rnd p (rsh 0 e2 a2))
=+ s2=|(s.n s.m)
[s=s2 e=:(sum:si e.n e.m e2) a=a4]
[s=s2 e=:(sum:si e.n e.m (sun:si e2)) a=a4]
++ div |= [p=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] ^- [s=? e=@ a=@]
=+ b=(rnd p (^div (lsh 0 (^mul p 2) a.n) a.m))
?: (^gte e.n e.m)
?: (^gte a.n a.m)
[s=|(s.n s.m) e=(dif:si e.n e.m) a=b]
[s=|(s.n s.m) e=(dif:si (dif:si e.n e.m) (sun:si 1)) a=b]