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

Merge branch 'dillbo' into talk

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-03-24 17:16:00 -07:00
commit f730f93d4a
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arvo/dill.hoon
View File

@ -49,6 +49,7 @@
$% [%bel ~] :: make a noise $% [%bel ~] :: make a noise
[%clr ~] :: clear the screen [%clr ~] :: clear the screen
[%hop p=@ud] :: set cursor position [%hop p=@ud] :: set cursor position
[%mor p=(list dill-blit)] :: multiple blits
[%pro p=(list ,@c)] :: show as cursor/line [%pro p=(list ,@c)] :: show as cursor/line
[%out p=(list ,@c)] :: send output line [%out p=(list ,@c)] :: send output line
[%sag p=path q=*] :: save to jamfile [%sag p=path q=*] :: save to jamfile
@ -236,6 +237,10 @@
++ from :: receive belt ++ from :: receive belt
|= bit=dill-blit |= bit=dill-blit
^+ +> ^+ +>
?: ?=(%mor -.bit)
|- ^+ +>.^$
?~ p.bit +>.^$
$(p.bit t.p.bit, +>.^$ ^$(bit i.p.bit))
?: ?=(%out -.bit) ?: ?=(%out -.bit)
%+ done %blit %+ done %blit
:~ [%lin p.bit] :~ [%lin p.bit]
@ -250,6 +255,7 @@
(done %blit [bit ~]) (done %blit [bit ~])
:: ::
++ init :: initialize ++ init :: initialize
~& [%dill-init our]
=+ myt=(flop (need tem)) =+ myt=(flop (need tem))
=. tem ~ =. tem ~
=. moz :_(moz [hen %pass ~ %g %show [our [ram ~]] our ~]) =. moz :_(moz [hen %pass ~ %g %show [our [ram ~]] our ~])
@ -376,7 +382,7 @@
=+ ^= flo ^- (list (pair ship term)) =+ ^= flo ^- (list (pair ship term))
=+ myr=(clan p.q.hic) =+ myr=(clan p.q.hic)
?: =(%pawn myr) ?: =(%pawn myr)
~ [p.q.hic %dojo]~
?: =(%earl myr) ?: =(%earl myr)
=+ fap=(sein p.q.hic) =+ fap=(sein p.q.hic)
[[fap %dojo] [fap %talk] ~] [[fap %dojo] [fap %talk] ~]

4
main/app/dojo/core.hook
View File

@ -215,7 +215,7 @@
++ dp-model-sic ;~(plug dp-server-sic dp-config) :: ++dojo-model ++ dp-model-sic ;~(plug dp-server-sic dp-config) :: ++dojo-model
++ dp-server-gun (stag 0 (stag %gun dp-device)) :: ++dojo-server ++ dp-server-gun (stag 0 (stag %gun dp-device)) :: ++dojo-server
++ dp-server-sic (stag 0 (stag %sic dp-device)) :: ++dojo-server ++ dp-server-sic (stag 0 (stag %sic dp-device)) :: ++dojo-server
++ dp-twig wide:(vang & ~) :: ++twig ++ dp-twig long:(vang & ~) :: ++twig
++ dp-device (most fas sym) :: ++dojo-device ++ dp-device (most fas sym) :: ++dojo-device
++ dp-value :: ++dojo-source ++ dp-value :: ++dojo-source
%+ cook |=(a=dojo-source a) %+ cook |=(a=dojo-source a)
@ -609,7 +609,7 @@
:: ~& [%our-clock ven.say] :: ~& [%our-clock ven.say]
=^ dat say (~(transceive cs say) cal) =^ dat say (~(transceive cs say) cal)
?. ?& ?=(%del -.dat) ?. ?& ?=(%del -.dat)
:: =(+(p.dat) (lent buf.say)) =(+(p.dat) (lent buf.say))
== ==
+>.$ +>.$
=+ foy=(he-dope (tufa buf.say)) =+ foy=(he-dope (tufa buf.say))

21
main/app/seat/core.hook
View File

@ -98,9 +98,16 @@
== ==
-- --
++ se :: per source ++ se :: per source
|_ [moz=(list move) [her=ship ost=bone] source] |_ $: [moz=(list move) biz=(list dill-blit)]
[her=ship ost=bone]
source
==
++ se-abet :: resolve ++ se-abet :: resolve
[(flop moz) %_(+> bin (~(put by bin) ost +<+>))] :_ %_(+> bin (~(put by bin) ost +<+>))
%+ welp (flop moz)
^- (list move)
?~ biz ~
[ost %give %rush %dill-blit ?~(t.biz i.biz [%mor (flop biz)])]~
:: ::
++ se-belt :: handle input ++ se-belt :: handle input
|= bet=dill-belt |= bet=dill-belt
@ -195,7 +202,7 @@
:: ::
++ se-blit :: give output ++ se-blit :: give output
|= bil=dill-blit |= bil=dill-blit
(se-emit ost %give %rush %dill-blit bil) +>(biz [bil biz])
:: ::
++ se-show :: show buffer, raw ++ se-show :: show buffer, raw
|= lin=(pair ,@ud (list ,@c)) |= lin=(pair ,@ud (list ,@c))
@ -577,6 +584,7 @@
++ peer ++ peer
|= [ost=bone her=ship pax=path] |= [ost=bone her=ship pax=path]
^- [(list move) _+>] ^- [(list move) _+>]
~& [%seat-peer ost her pax]
?< (~(has by bin) ost) ?< (~(has by bin) ost)
:- [ost %give %rush %dill-blit %pro [`@c`0x23 `@c`0x20 ~]]~ :- [ost %give %rush %dill-blit %pro [`@c`0x23 `@c`0x20 ~]]~
%= +> %= +>
@ -603,17 +611,18 @@
^- [(list move) _+>] ^- [(list move) _+>]
=< se-abet =< se-abet
=< se-view =< se-view
(~(se-belt se [ost %give %nice ~]~ [her ost] (~(got by bin) ost)) bet) (~(se-belt se [[ost %give %nice ~]~ ~] [her ost] (~(got by bin) ost)) bet)
:: ::
++ pour ++ pour
|= [ost=bone pax=path sih=*] |= [ost=bone pax=path sih=*]
^- [(list move) _+>] ^- [(list move) _+>]
~? =(~ (~(get by bin) ost)) [%seat-pour ost pax]
=+ sih=((hard sign) sih) =+ sih=((hard sign) sih)
?> ?=([@ @ @ ~] pax) ?> ?=([@ @ @ ~] pax)
=< se-abet =< se-abet
=< se-view =< se-view
=+ gyl=[(slav %p i.t.pax) i.t.t.pax] =+ gyl=[(slav %p i.t.pax) i.t.t.pax]
(~(se-pour se ~ [(slav %p i.pax) ost] (~(got by bin) ost)) gyl +.sih) (~(se-pour se [~ ~] [(slav %p i.pax) ost] (~(got by bin) ost)) gyl +.sih)
:: ::
++ pull ++ pull
|= ost=bone |= ost=bone
@ -621,6 +630,6 @@
=^ moz +> =^ moz +>
=< se-abet =< se-abet
=< se-view =< se-view
~(se-kill se ~ [our.hid ost] (~(got by bin) ost)) ~(se-kill se [~ ~] [our.hid ost] (~(got by bin) ost))
[moz +>.$(bin (~(del by bin) ost))] [moz +>.$(bin (~(del by bin) ost))]
-- --

1
main/sur/console/core.hook
View File

@ -105,6 +105,7 @@
$% [%bel ~] :: make a noise $% [%bel ~] :: make a noise
[%clr ~] :: clear the screen [%clr ~] :: clear the screen
[%hop p=@ud] :: set cursor position [%hop p=@ud] :: set cursor position
[%mor p=(list dill-blit)] :: multiple blits
[%pro p=(list ,@c)] :: show as cursor/line [%pro p=(list ,@c)] :: show as cursor/line
[%out p=(list ,@c)] :: send output line [%out p=(list ,@c)] :: send output line
[%sag p=path q=*] :: save to jamfile [%sag p=path q=*] :: save to jamfile