diff --git a/app/hood.hoon b/app/hood.hoon index cca1a8c4aa..34926b3ae3 100644 --- a/app/hood.hoon +++ b/app/hood.hoon @@ -4,11 +4,7 @@ /? 310 :: zuse version /+ sole, talk, :: libraries hood-helm, hood-kiln, hood-drum, hood-write, hood-womb :: "libraries" -[. hood-helm hood-kiln hood-drum] |% -++ womb hood-womb -++ write hood-write -:: ++ hood-sample => |% += part [%sample %0 pith] @@ -36,21 +32,21 @@ |* hed/hood-head :: |= paw/hood-part :: ?- hed :: - $drum ?>(?=($drum -.paw) `drum-part`paw) :: - $helm ?>(?=($helm -.paw) `helm-part`paw) :: - $kiln ?>(?=($kiln -.paw) `kiln-part`paw) :: - $womb ?>(?=($womb -.paw) `part:womb`paw) :: - $write ?>(?=($write -.paw) `part:write`paw) :: + $drum ?>(?=($drum -.paw) `part:hood-drum`paw) :: + $helm ?>(?=($helm -.paw) `part:hood-helm`paw) :: + $kiln ?>(?=($kiln -.paw) `part:hood-kiln`paw) :: + $womb ?>(?=($womb -.paw) `part:hood-womb`paw) :: + $write ?>(?=($write -.paw) `part:hood-write`paw) :: == :: ++ hood-head _-:*hood-part :: ++ hood-make :: |* {our/@p hed/hood-head} :: ?- hed :: - $drum (drum-make our) :: - $helm *helm-part :: - $kiln *kiln-part :: - $womb *part:womb :: - $write *part:write :: + $drum (make:hood-drum our) :: + $helm *part:hood-helm :: + $kiln *part:hood-kiln :: + $womb *part:hood-womb :: + $write *part:hood-write :: == :: ++ hood-part-old hood-part :: ++ hood-port :: @@ -58,11 +54,11 @@ paw :: :: :: ++ hood-part :: - $% {$drum $2 drum-pith-2} :: - {$helm $0 helm-pith} :: - {$kiln $0 kiln-pith} :: - {$womb $1 pith:womb} :: - {$write $0 pith:write} :: + $% {$drum $2 pith-2:hood-drum} :: + {$helm $0 pith:hood-helm} :: + {$kiln $0 pith:hood-kiln} :: + {$womb $1 pith:hood-womb} :: + {$write $0 pith:hood-write} :: == :: -- :: :: :: :: @@ -108,7 +104,7 @@ :: ++ poke-hood-load |= dat/hood-part - ?> =(our src) + ?> =(our.hid src.hid) ~& loaded+-.dat [~ %_(+> lac (~(put by lac) -.dat dat))] :: @@ -140,7 +136,7 @@ ++ note-helm (wrap take-note):from-helm ++ onto-drum (wrap take-onto):from-drum ++ peer-drum (wrap peer):from-drum -++ peek-x-womb peek-x:(womb hid (able %womb)) +++ peek-x-womb peek-x:(hood-womb hid (able %womb)) ++ peer-scry-x-womb (wrap peer-scry-x):from-womb ++ poke-atom (wrap poke-atom):from-helm ++ poke-dill-belt (wrap poke-dill-belt):from-drum diff --git a/lib/hood/drum.hoon b/lib/hood/drum.hoon index 2ca592e045..53f518c577 100644 --- a/lib/hood/drum.hoon +++ b/lib/hood/drum.hoon @@ -9,18 +9,18 @@ :::: :: :: :: :: :: |% :: :: -++ drum-part {$drum $2 drum-pith-2} :: -++ drum-part-old {$drum $1 drum-pith-1} :: +++ part {$drum $2 pith-2} :: +++ part-old {$drum $1 pith-1} :: :: :: -++ drum-pith-1 :: pre-style - %+ cork drum-pith-2 :: - |=(drum-pith-2 +<(bin *(map bone source-1))) :: +++ pith-1 :: pre-style + %+ cork pith-2 :: + |=(pith-2 +<(bin *(map bone source-1))) :: :: :: ++ source-1 :: %+ cork source :: |=(source +<(mir *(pair @ud (list @c)))) :: style-less mir :: :: -++ drum-pith-2 :: +++ pith-2 :: $: sys/(unit bone) :: local console eel/(set gill:gall) :: connect to ray/(set well:gall) :: @@ -92,9 +92,9 @@ [[(sein:title our) %talk] [our %dojo] ~] [[our %talk] [our %dojo] ~] :: -++ drum-make :: initial part +++ make :: initial part |= our/ship - ^- drum-part + ^- part :* %drum %2 ~ :: sys @@ -104,19 +104,20 @@ ~ :: bin == :: :: -++ drum-path :: encode path +:: +++ en-gill :: gill to wire |= gyl/gill:gall ^- wire [%drum %phat (scot %p p.gyl) q.gyl ~] :: -++ drum-phat :: decode path +++ de-gill :: gill from wire |= way/wire ^- gill:gall ?>(?=({@ @ $~} way) [(slav %p i.way) i.t.way]) -- :: :::: :: -|= {hid/bowl:gall drum-part} :: main drum work +|= {hid/bowl:gall part} :: main drum work =+ (fall (~(get by bin) ost.hid) *source) =* dev - => |% :: arvo structures @@ -140,7 +141,7 @@ ++ diff-sole-effect-phat :: app event |= {way/wire fec/sole-effect} =< se-abet =< se-view - =+ gyl=(drum-phat way) + =+ gyl=(de-gill way) ?: (se-aint gyl) +>.$ (se-diff gyl fec) :: @@ -182,7 +183,7 @@ ++ reap-phat :: ack connect |= {way/wire saw/(unit tang)} =< se-abet =< se-view - =+ gyl=(drum-phat way) + =+ gyl=(de-gill way) ?~ saw (se-join gyl) (se-dump:(se-drop & gyl) u.saw) @@ -191,7 +192,7 @@ |= {way/wire saw/(unit tang)} =< se-abet =< se-view ?~ saw +> - =+ gyl=(drum-phat way) + =+ gyl=(de-gill way) ?: (se-aint gyl) +>.$ %- se-dump:(se-drop & gyl) :_ u.saw @@ -213,15 +214,15 @@ ++ quit-phat :: |= way/wire =< se-abet =< se-view - =+ gyl=(drum-phat way) + =+ gyl=(de-gill way) ~& [%drum-quit src.hid ost.hid gyl] (se-drop %| gyl) :: :: :: :::: :: :: :: :: :: ++ se-abet :: resolve - ^- (quip move drum-part) - =* pith +>+>+<+ + ^- (quip move part) + =* pith +<+.$ ?. se-ably =. . se-adit [(flop moz) pith] @@ -449,16 +450,16 @@ :: ++ se-poke :: send a poke |= {gyl/gill:gall par/pear} - (se-emit [ost.hid %poke (drum-path gyl) gyl par]) + (se-emit [ost.hid %poke (en-gill gyl) gyl par]) :: ++ se-peer :: send a peer |= gyl/gill:gall %- se-emit(fug (~(put by fug) gyl ~)) - [ost.hid %peer (drum-path gyl) gyl /sole] + [ost.hid %peer (en-gill gyl) gyl /sole] :: ++ se-pull :: cancel subscription |= gyl/gill:gall - (se-emit [ost.hid %pull (drum-path gyl) gyl ~]) + (se-emit [ost.hid %pull (en-gill gyl) gyl ~]) :: ++ se-tame :: switch connection |= gyl/gill:gall diff --git a/lib/hood/helm.hoon b/lib/hood/helm.hoon index a811336eb7..bfef214267 100644 --- a/lib/hood/helm.hoon +++ b/lib/hood/helm.hoon @@ -9,12 +9,12 @@ :::: :: :: :: :: :: |% :: :: -++ helm-part {$helm $0 helm-pith} :: helm state -++ helm-pith :: helm content - $: bur/(unit (pair ship mace:ames)) :: requesting ticket - hoc/(map bone helm-session) :: consoles +++ part {$helm $0 pith} :: helm state +++ pith :: helm content + $: bur/(unit (pair ship mace:ames)) :: requesting ticket + hoc/(map bone session) :: consoles == :: -++ helm-session :: +++ session :: $: say/sole-share :: console state mud/(unit (sole-dialog @ud)) :: console dialog == :: @@ -43,8 +43,8 @@ :: :: :: :::: :: :: :: :: :: -|= {bowl:gall helm-part} :: main helm work -=+ sez=(fall (~(get by hoc) ost) *helm-session) +|= {bowl:gall part} :: main helm work +=+ sez=(fall (~(get by hoc) ost) *session) => |% :: arvo structures ++ card :: $% {$cash wire p/@p q/buck:ames} :: @@ -66,7 +66,7 @@ -- |_ moz/(list move) ++ abet :: resolve - [(flop moz) %_(+>+>+<+ hoc (~(put by hoc) ost sez))] + [(flop moz) %_(+<+.$ hoc (~(put by hoc) ost sez))] :: ++ emit |=(card %_(+> moz [[ost +<] moz])) :: return card ++ emil :: return cards diff --git a/lib/hood/kiln.hoon b/lib/hood/kiln.hoon index f01aa9cce0..3d86f37ee7 100644 --- a/lib/hood/kiln.hoon +++ b/lib/hood/kiln.hoon @@ -9,9 +9,9 @@ =, space:userlib =, format |% :: :: -++ kiln-part {$kiln $0 kiln-pith} :: kiln state -++ kiln-pith :: - $: rem/(map desk kiln-desk) :: +++ part {$kiln $0 pith} :: kiln state +++ pith :: :: + $: rem/(map desk per-desk) :: syn/(map kiln-sync {let/@ud ust/bone}) :: autoload-on/? :: cur-hoon/@uvI :: @@ -19,7 +19,7 @@ cur-zuse/@uvI :: cur-vanes/(map @tas @uvI) :: == :: -++ kiln-desk :: per-desk state +++ per-desk :: per-desk state $: auto/? :: escalate on failure gem/germ :: strategy her/@p :: from ship @@ -56,7 +56,7 @@ :: :: :: :::: :: :: :: :: :: -|= {bowl:gall kiln-part} :: main kiln work +|= {bowl:gall part} :: main kiln work ?> =(src our) => |% :: arvo structures ++ card :: @@ -82,7 +82,7 @@ -- |_ moz/(list move) ++ abet :: resolve - [(flop moz) `kiln-part`+>+>->] + [(flop moz) `part`+<+.$] :: ++ emit |=(card %_(+> moz [[ost +<] moz])) :: return card ++ emil :: return cards @@ -406,9 +406,9 @@ :: ++ work :: state machine |= syd/desk - =+ ^- kiln-desk + =+ ^- per-desk %+ fall (~(get by rem) syd) - =+ *kiln-desk + =+ *per-desk %_(- cas [%da now]) |% ++ abet :: resolve