Merge branch 'demo' of github.com:urbit/urbit into demo

This commit is contained in:
Galen Wolfe-Pauly 2015-06-08 18:14:51 -07:00
commit d030d5dc82
3 changed files with 15 additions and 6 deletions

View File

@ -286,7 +286,7 @@
::
++ sh-rend :: print on one line
|= gam=telegram
(sh-pass:(sh-fact %txt ~(tr-line tr man.she gam)) q.q.gam)
(sh-pass:(sh-fact %txt ~(tr-line tr man.she gam)) q.q.gam)
::
++ sh-numb :: print msg number
|= num=@ud
@ -915,7 +915,11 @@
?~ q.yop ~
?~(t.q.yop `i.q.yop `[%mor (flop `(list sole-effect)`q.yop)])
==
?~(foc moz [[ost %diff %sole-effect u.foc] moz])
?~ foc
moz
~& [%ra-abed-fx-mug `@p`(mug u.foc)]
~& [%ra-abed-fx u.foc]
[[ost %diff %sole-effect u.foc] moz]
::
++ ra-abet :: complete core
ra-abed:ra-axel
@ -1399,7 +1403,7 @@
?. ?=([~ %$ ?(%ud %da) @] say) ~
?. ?=([~ %$ ?(%ud %da) @] den) ~
`[(point +>.say) (point +>.den)]
:: ~& [%pa-listen her pax ruv]
~& [%pa-listen count her pax ruv]
?~ ruv
~& [%pa-listen-malformed pax]
(pa-sauce ost [%quit ~]~)

View File

@ -678,10 +678,10 @@
++ ap-fill :: add to queue
^- [? _.]
=+ suy=(fall (~(get by qel.ged) ost) 0)
?: =(20 suy)
?: =(40 suy)
~& [%ap-fill-full [our dap] q.q.pry ost]
[%| +]
:: ~? !=(20 suy) [%ap-fill-add [[our dap] q.q.pry ost] +(suy)]
:: ~? !=(40 suy) [%ap-fill-add [[our dap] q.q.pry ost] +(suy)]
[%& +(qel.ged (~(put by qel.ged) ost +(suy)))]
::
++ ap-find :: general arm

View File

@ -180,6 +180,7 @@
|= [way=wire fec=sole-effect]
=< se-abet =< se-view
=+ gyl=(drum-phat way)
~& [%diff-effect way gyl (se-aint gyl) `@p`(mug fec)]
?: (se-aint gyl) +>.$
(se-diff gyl fec)
::
@ -211,6 +212,7 @@
++ reap-phat ::
|= [way=wire saw=(unit tang)]
=< se-abet =< se-view
~& [%reap-phat way]
=+ gyl=(drum-phat way)
?~ saw
(se-join gyl)
@ -374,6 +376,7 @@
++ se-joke :: prepare connection
|= gyl=gill
^+ +>
~& [%se-joke gyl]
=+ lag=se-agon
?~ lag +>.$
?: =(~ fug) +>.$
@ -382,6 +385,7 @@
++ se-join :: confirm connection
|= gyl=gill
^+ +>
~& [%se-join gyl]
=. +> (se-text "[linked to {<gyl>}]")
?> =(~ (~(got by fug) gyl))
(se-alas:se-prom(liv.maz |, fug (~(put by fug) gyl `*target)) gyl)
@ -688,7 +692,8 @@
%tan (ta-tan p.fec)
%sag +>(+> (se-blit fec))
%sav +>(+> (se-blit fec))
%txt $(fec [%tan [%leaf p.fec]~])
%txt ~& [%ta-fec (tape p.fec)]
$(fec [%tan [%leaf p.fec]~])
==
::
++ ta-dog :: change cursor