urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-04 10:32:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

mall: convert drum to mall

Browse Source
This commit is contained in:
Philip Monk 2019-09-05 20:01:31 -07:00
parent 84c7b442e9
commit 2c5a478a84
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
6 changed files with 1123 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/arvo/age/hood.hoon
View File

@ -2,6 +2,7 @@
:::: /hoon/hood/app :: ::
:: :: ::
/? 310 :: zuse version
/- *sole
/+ sole, :: libraries
:: XX these should really be separate apps, as
:: none of them interact with each other in
@ -11,7 +12,7 @@
:: they have been bundled into :hood
::
:: |command handlers
hood-helm-mall, hood-kiln, hood-drum, hood-write
hood-helm-mall, hood-kiln, hood-drum-mall, hood-write
:: :: ::
:::: :: ::
:: :: ::
@ -45,7 +46,7 @@
|@ ++ $
|: paw=$:hood-part
?- hed
$drum ?>(?=($drum -.paw) `part:hood-drum`paw)
$drum ?>(?=($drum -.paw) `part:hood-drum-mall`paw)
$helm ?>(?=($helm -.paw) `part:hood-helm-mall`paw)
$kiln ?>(?=($kiln -.paw) `part:hood-kiln`paw)
$write ?>(?=($write -.paw) `part:hood-write`paw)
@ -56,7 +57,7 @@
=+ $:{our/@p hed/hood-head} ::
|@ ++ $
?- hed
$drum (make:hood-drum our)
$drum (make:hood-drum-mall our)
$helm *part:hood-helm-mall
$kiln *part:hood-kiln
$write *part:hood-write
@ -68,7 +69,7 @@
paw ::
:: ::
++ hood-part :: current module state
$% {$drum $2 pith-2:hood-drum} ::
$% {$drum $2 pith-2:hood-drum-mall} ::
{$helm $0 pith:hood-helm-mall} ::
{$kiln $0 pith:hood-kiln} ::
{$write $0 pith:hood-write} ::
@ -120,7 +121,7 @@
=. +>.handle (start hid ((able hid) identity))
(ably (handle a))
:: per-module interface wrappers
++ from-drum (from-module %drum [..$ _se-abet]:(hood-drum))
++ from-drum (from-module %drum [..$ _se-abet]:(hood-drum-mall))
++ from-helm (from-module %helm [..$ _abet]:(hood-helm-mall))
++ from-kiln (from-module %kiln [..$ _abet]:(hood-kiln))
++ from-write (from-module %write [..$ _abet]:(hood-write))
@ -176,12 +177,33 @@
(need !<(~ vase))
%helm-bonk %- (wrap poke-bonk):from-helm:h
(need !<(~ vase))
%dill-belt %- (wrap poke-dill-belt):from-drum:h
(need !<(dill-belt:dill vase))
%dill-blit %- (wrap poke-dill-blit):from-drum:h
(need !<(dill-blit:dill vase))
%drum-put %- (wrap poke-put):from-drum:h
(need !<([path @] vase))
%drum-link %- (wrap poke-link):from-drum:h
(need !<(gill:gall vase))
%drum-unlink %- (wrap poke-unlink):from-drum:h
(need !<(gill:gall vase))
%drum-exit %- (wrap poke-exit):from-drum:h
(need !<(~ vase))
%drum-start %- (wrap poke-start):from-drum:h
(need !<(well:gall vase))
%drum-set-boot-apps %- (wrap poke-set-boot-apps):from-drum:h
(need !<(? vase))
==
[moves ..handle-init]
::
++ handle-peer
|= path
`..handle-init
|= =path
=/ h (help hid)
=^ moves lac
?+ path ~|([%hood-bad-path wire] !!)
[%drum *] ((wrap peer):from-drum:h t.path)
==
[moves ..handle-init]
::
++ handle-pull
|= path
@ -197,8 +219,19 @@
=/ h (help hid)
=^ moves lac
?+ wire ~|([%hood-bad-wire wire] !!)
[%helm %hi *] %+ (wrap coup-hi):from-helm:h t.t.wire
?>(?=(%coup -.internal-gift) p.internal-gift)
[%helm %hi *] %+ (wrap coup-hi):from-helm:h t.t.wire
?>(?=(%coup -.internal-gift) p.internal-gift)
[%drum %phat *]
?- -.internal-gift
%http-response !!
%coup ((wrap take-coup-phat):from-drum:h t.t.wire p.internal-gift)
%reap ((wrap reap-phat):from-drum:h t.t.wire p.internal-gift)
%quit ((wrap quit-phat):from-drum:h t.t.wire)
%diff
%+ (wrap diff-sole-effect-phat):from-drum:h t.t.wire
?> ?=(%sole-effect p.p.internal-gift)
(need !<(sole-effect q.p.internal-gift))
==
==
[moves ..handle-init]
::
@ -208,6 +241,7 @@
=^ moves lac
?+ wire ~|([%hood-bad-wire wire] !!)
[%helm *] ((wrap take):from-helm:h t.wire vase)
[%drum *] ((wrap take):from-drum:h t.wire vase)
==
[moves ..handle-init]
::

8
pkg/arvo/app/cop.hoon
View File

@ -12,9 +12,11 @@
^- (quip move _this)
:_ this :_ ~
?+ arg ~|(%bad-arg !!)
%conf [ost.bowl %conf-mall / [our.bowl %hood] [our.bowl %home]]
%poke [ost.bowl %deal-mall / [our.bowl our.bowl] %hood %poke %atom !>(%hey)]
%hi [ost.bowl %deal-mall / [our.bowl our.bowl] %hood %poke %helm-send-hi !>([our.bowl `"heyza"])]
%conf [ost.bowl %conf-mall / [our.bowl %hood] [our.bowl %home]]
%poke [ost.bowl %deal-mall / [our.bowl our.bowl] %hood %poke %atom !>(%hey)]
%hi [ost.bowl %deal-mall / [our.bowl our.bowl] %hood %poke %helm-send-hi !>([our.bowl `"heyza"])]
%start [ost.bowl %deal-mall / [our.bowl our.bowl] %hood %poke %drum-start !>([%home %first])]
%first [ost.bowl %deal-mall / [our.bowl our.bowl] %first %poke %atom !>(%hey)]
==
::
++ onto

1072
pkg/arvo/lib/hood/drum-mall.hoon Normal file
View File

File diff suppressed because it is too large Load Diff

20
pkg/arvo/lib/hood/helm-mall.hoon
View File

@ -35,26 +35,6 @@
:: :: ::
|: $:{bowl:gall part} :: main helm work
=+ sez=(~(gut by hoc) ost $:session)
=> |% :: arvo structures
++ card ::
$% [%bonk wire ~] ::
{$flog wire flog:dill} ::
{$nuke wire ship} ::
[%serve wire binding:eyre generator:eyre] ::
{$poke wire dock pear} ::
{$rest wire @da} ::
{$wait wire @da} ::
{$rekey wire life ring} ::
{$moon wire ship udiff:point:able:jael} ::
== ::
++ move (pair bone card) :: user-level move
++ pear :: poke fruit
$% {$hood-unsync desk ship desk} ::
{$helm-hi cord} ::
{$drum-start well:gall} ::
{$hall-action action:hall} ::
== ::
--
=| moz=(list move:agent:mall)
|%
++ abet

2
pkg/arvo/sys/vane/mall.hoon
View File

@ -1466,7 +1466,7 @@
::
=/ initialised (mo-abed:mo duct)
?- -.task
%conf-mall
?(%conf %conf-mall)
=/ =dock p.task
=/ =ship p.dock
?. =(our ship)

3
pkg/arvo/sys/zuse.hoon
View File

@ -1867,7 +1867,8 @@
== ::
++ task :: incoming request
$~ [%vega ~] ::
$% {$conf-mall p/dock q/dock} :: configure app
$% {$conf p/dock q/dock} :: configure app
{$conf-mall p/dock q/dock} :: configure app
$>(%init vane-task) :: set owner
{$deal p/sock q/internal-task} :: full transmission
{$deal-mall p/sock q/internal-task} :: full transmission