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 'test' of github.com:urbit/urbit into test

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-04-28 14:03:36 -07:00
commit 6b3e74a284
3 changed files with 41 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/app/talk/core.hook
View File

@ -1832,6 +1832,7 @@
++ prep ++ prep
|= old=(unit (unit house-any)) |= old=(unit (unit house-any))
^- [(list move) _+>] ^- [(list move) _+>]
~& %talk-prep
?> ?=(^ old) ?> ?=(^ old)
=| moz=(list move) =| moz=(list move)
|- |-

2
main/arvo/ford.hoon
View File

@ -269,6 +269,8 @@
++ awap :: get next revision ++ awap :: get next revision
~% %ford-w ..is ~ ~% %ford-w ..is ~
|= dep=@uvH |= dep=@uvH
?~ dep
~&(dep-empty/hen +>.$)
%_ +>.$ %_ +>.$
mow mow
%- welp :_ mow %- welp :_ mow

102
main/arvo/gall.hoon
View File

@ -57,12 +57,10 @@
++ note :: out request $-> ++ note :: out request $->
$? $: %a :: to %ames $? $: %a :: to %ames
$% [%wont p=sock q=path r=*] :: $% [%wont p=sock q=path r=*] ::
== == ::
$: %c :: to %clay
$% [%warp p=sock q=riff] ::
== == :: == == ::
$: %f :: to %ford $: %f :: to %ford
$% [%exec p=@p q=beak r=(unit silk)] :: $% [%exec p=@p q=beak r=(unit silk)] ::
[%wasp p=@p q=@uvH] ::
== == :: == == ::
$: %g :: to %gall $: %g :: to %gall
$% [%show p=hapt q=ship r=path] :: $% [%show p=hapt q=ship r=path] ::
@ -116,7 +114,7 @@
peq=(map bone ,@uvI) :: peekers peq=(map bone ,@uvI) :: peekers
qel=(map bone ,@ud) :: rush queue length qel=(map bone ,@ud) :: rush queue length
== :: == ::
ped=(set (pair ship desk)) :: active depends ped=@uvH :: active depends
zam=scar :: opaque ducts zam=scar :: opaque ducts
== :: == ::
++ silk :: see %ford ++ silk :: see %ford
@ -156,6 +154,7 @@
== == :: == == ::
$: %f :: by %ford $: %f :: by %ford
$% [%made p=@uvH q=(each gage tang)] :: $% [%made p=@uvH q=(each gage tang)] ::
[%news ~] ::
== == == :: == == == ::
++ toil (pair duct knob) :: work in progress ++ toil (pair duct knob) :: work in progress
-- :::::::::::::::::::::::::::::::::::::::::::::::::::::: -- ::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -404,6 +403,8 @@
[hen %give %mean u.q.sih] [hen %give %mean u.q.sih]
:: ::
%f %f
?. ?=(%made +<.sih)
~& [%gall-bad-gasp +<.sih] `..^$
:_ ..^$ :_ ..^$
:_ ~ :_ ~
:- hen :- hen
@ -438,6 +439,7 @@
[%pass [%r pax] %g %took [our imp] you] [%pass [%r pax] %g %took [our imp] you]
:: ::
%f %f
?< ?=(%news -.+.sih)
:_ ~ :- hen :_ ~ :- hen
?- -.q.+.sih ?- -.q.+.sih
%| [%give %mean ~ %ford-fail p.q.+.sih] %| [%give %mean ~ %ford-fail p.q.+.sih]
@ -694,44 +696,16 @@
:: ~& [%deff imp cub.sat] :: ~& [%deff imp cub.sat]
[hon r.q.caq] [hon r.q.caq]
:: ::
++ drug :: set dependencies ++ drum :: set dependencies
|= pen=(set (pair ship desk))
:: ~& [%drug ped=ped.sat]
:: ~& [%drug pen=pen]
^+ +>
=+ ^= new ^- (list move)
%+ turn
%+ skip (~(tap in pen) ~)
|=(a=(pair ship desk) (~(has in ped.sat) a))
|= a=(pair ship desk)
:* hun.mat %pass (away %w %drug (scot %p p.a) q.a ~) %c
%warp [our p.a] q.a ~
%many %& [%da +(now)] [%da (add now ~d1000)] /
==
=+ ^= old ^- (list move)
%+ turn
%+ skip (~(tap in ped.sat) ~)
|=(a=(pair ship desk) (~(has in pen) a))
|= a=(pair ship desk)
:- hun.mat
:^ %pass (away %w %drug (scot %p p.a) q.a ~) %c
:: ~& [%sync-unsubscribe our p.a q.a]
[%warp [our p.a] q.a ~]
%_(+>.$ ped.sat pen, mow :(weld new old mow))
::
++ drum :: raw dependencies
|= dep=@uvH |= dep=@uvH
^+ +> ^+ +>
?> ?=(^ orm.sat) ?~ dep ~&(%drum-none +>.$)
%- drug ?: =(dep ped.sat) +>.$
=+ ped=`(set (pair ship desk))`[[our %main] ~ ~] =+ pax=(away %w %drum (scot %uv dep) ~)
ped %_ +>.$
::=+ mav=(~(tap by dep) ~) ped.sat dep
::|- ^+ ped mow :_(mow [hun.mat %pass pax %f %wasp our dep]) :: XX cancel old
::?~ mav ped ==
::?: =(r.i.mav [%da u.orm.sat])
:: $(mav t.mav, ped (~(put in ped) p.i.mav q.i.mav))
::$(mav t.mav)
:: ::
++ ford :: exec to ford ++ ford :: exec to ford
|= [pax=path kas=silk] |= [pax=path kas=silk]
@ -774,7 +748,7 @@
:: ::
++ mack :: apply standard ++ mack :: apply standard
|= sih=sign |= sih=sign
?> ?=(%f -.sih) ?> ?=([%f %made *] sih)
^- [(unit (list tank)) _+>] ^- [(unit (list tank)) _+>]
?- -.q.+.sih ?- -.q.+.sih
& :- ~ & :- ~
@ -786,7 +760,7 @@
++ meek :: apply peek ++ meek :: apply peek
|= sih=sign |= sih=sign
^- [(unit cage) _+>] ^- [(unit cage) _+>]
?> ?=(%f -.sih) ?> ?=([%f %made *] sih)
?- -.q.+.sih ?- -.q.+.sih
& =+ vax=`vase`q.p.q.+.sih & =+ vax=`vase`q.p.q.+.sih
?. &(?=(^ q.vax) ?=(@ -.q.vax)) ?. &(?=(^ q.vax) ?=(@ -.q.vax))
@ -799,9 +773,9 @@
:: ::
++ mick :: apply w/depends ++ mick :: apply w/depends
|= sih=sign |= sih=sign
?> ?=(%f -.sih) ?> ?=([%f %made *] sih)
^- [[p=? q=@uvH] _+>] ^- [? _+>]
:- [-.q.+.sih p.+.sih] :- -.q.+.sih
?- -.q.+.sih ?- -.q.+.sih
& %- obey:(morn (slot 3 q.p.q.+.sih)) & %- obey:(morn (slot 3 q.p.q.+.sih))
(slot 2 q.p.q.+.sih) (slot 2 q.p.q.+.sih)
@ -811,7 +785,7 @@
++ muck :: apply part ++ muck :: apply part
|= sih=sign |= sih=sign
^- [(unit (list tank)) _+>] ^- [(unit (list tank)) _+>]
?> ?=(%f -.sih) ?> ?=([%f %made *] sih)
?- -.q.+.sih ?- -.q.+.sih
& [~ (obey q.p.q.+.sih)] & [~ (obey q.p.q.+.sih)]
| [`p.q.+.sih (give %crud %muck-made p.q.+.sih)] | [`p.q.+.sih (give %crud %muck-made p.q.+.sih)]
@ -819,12 +793,12 @@
:: ::
++ murk :: apply park ++ murk :: apply park
|= sih=sign |= sih=sign
^- [(unit cage) _+>] ^- [[p=@uvH q=(unit cage)] _+>]
?> ?=(%f -.sih) ?> ?=([%f %made *] sih)
?- -.q.+.sih ?- -.q.+.sih
& ?. ?=(@ p.p.q.+.sih) ~| %bad-marc !! & ?. ?=(@ p.p.q.+.sih) ~| %bad-marc !!
[`p.q.+.sih +>.$] [[p.+.sih `p.q.+.sih] +>.$]
| [~ (give %crud %murk-made p.q.+.sih)] | [[p.+.sih ~] (give %crud %murk-made p.q.+.sih)]
== ==
:: ::
++ more :: domestic take ++ more :: domestic take
@ -851,9 +825,9 @@
:: ::
%park %park
=^ gyd +>.$ (murk q.hin) =^ gyd +>.$ (murk q.hin)
?~ gyd ?~ q.gyd (drum p.gyd)
+>.$ =. +>.$ (drum p.gyd)
(quen %load u.gyd) (quen %load u.q.gyd)
:: ::
%part %part
=^ gud +>.$ (muck q.hin) =^ gud +>.$ (muck q.hin)
@ -906,8 +880,8 @@
:: ::
%prep %prep
=^ gad +>.$ (mick q.hin) =^ gad +>.$ (mick q.hin)
?. p.gad (drum q.gad) ?. gad +>.$
deal:(drum q.gad) deal
:: ::
%pull %pull
=^ gud +>.$ (mack q.hin) =^ gud +>.$ (mack q.hin)
@ -922,15 +896,15 @@
== ==
:: ::
%w :: autoboot %w :: autoboot
?> ?=([%drug @ @ ~] t.pax) ?> ?=([%drum @ ~] t.pax)
=+ :* sin=((hard ,[%c %writ p=(unit)]) q.hin) ?> ?=([%f %news ~] q.hin)
our=(need (slaw %p i.t.t.pax)) :: ?> ?=([%drug @ @ ~] t.pax)
syd=(need ((sand %tas) i.t.t.t.pax)) :: =+ :- sin=((hard ,[%c %writ p=(unit)]) q.hin)
== :: [our syd]=(raid t.t.pax %p %tas ~)
::~& [%sync-notified `@p`our `@ta`syd] :: ::~& [%sync-notified `@p`our `@ta`syd]
=. ped.sat (~(del by ped.sat) [our syd]) :: =. ped.sat (~(del by ped.sat) [our syd])
?~ p.+.sin :: ?~ p.+.sin
+>.$ :: +>.$
+>.$(vey.sat (~(put to vey.sat) hen %boot ~)) +>.$(vey.sat (~(put to vey.sat) hen %boot ~))
== ==
:: ::