diff --git a/base/ape/dojo/core.hook b/base/ape/dojo/core.hook index 0f5613dda..134731064 100644 --- a/base/ape/dojo/core.hook +++ b/base/ape/dojo/core.hook @@ -715,13 +715,13 @@ == -- :: -++ peer +++ peer-sole |= [from pax=path] ^- (quip move +>) ~? !=(src our.hid) [%dojo-peer-stranger ost src pax] :: ?> =(src our.hid) ?< (~(has by hoc) ost) - ?> =(/sole pax) + ?> =(~ pax) =< he-abet %~ he-peer he :- [ost ~] diff --git a/base/ape/helm/core.hook b/base/ape/helm/core.hook deleted file mode 100644 index ed4fd97b4..000000000 --- a/base/ape/helm/core.hook +++ /dev/null @@ -1,183 +0,0 @@ -:: :: :: -:::: /hook/core/helm/ape :: :: - :: :: :: -/? 314 :: zuse version -/- *sole :: structures -/+ sole :: libraries -:: :: :: -:::: :: :: - !: :: :: -=> |% :: principal structures - ++ helm-house :: all state - $: %0 :: state version - bur=(unit (pair ship mace)) :: requesting ticket - hoc=(map bone helm-session) :: consoles - == :: - ++ helm-session :: - $: say=sole-share :: - mud=(unit (sole-dialog ,@ud)) :: - == :: - ++ funk (pair ,@ ,@) :: - ++ begs ,[his=@p tic=@p eny=@t ges=gens] :: begin data - ++ helm-wish :: - $| $? %reset :: reset kernel - %verb :: verbose mode - == :: - $% [%reload p=(list term)] :: reload vanes - == :: - ++ suss ,[term @tas @da] :: config report - ++ dill :: sent to %dill - $% [%crud p=term q=(list tank)] :: fat report - [%text p=tape] :: thin report - [%veer p=@ta q=path r=@t] :: install vane - [%vega p=path] :: reboot by path - [%verb ~] :: verbose mode - == :: - ++ card :: - $% [%cash wire p=@p q=buck] :: - [%conf wire dock %load ship term] :: - [%flog wire dill] :: - [%plug wire @p @tas @p @tas] :: - [%want wire sock path *] :: send message - == :: - ++ move (pair bone card) :: user-level move - -- :: -:: :: -:::: :: - :: :: -|_ $: hid=hide :: system state - helm-house :: program state - == :: -++ he :: per session - |_ [[ost=bone moz=(list move)] helm-session] :: - ++ he-abet :: resolve - [(flop moz) %_(+> hoc (~(put by hoc) ost +<+))] :: - :: :: - ++ he-wish-start - |= dap=term - %_(+> moz :_(moz [ost %conf /start [our.hid dap] %load our.hid %main])) - :: - ++ he-wish-reset - ^+ . - =- %_(+ moz (weld zum moz)) - ^= zum %- flop ^- (list move) - =+ top=`path`/(scot %p our.hid)/base/arvo/(scot %da lat.hid) - :- [ost %flog /reset %vega (weld top `path`/hoon)] - %+ turn - ^- (list ,[p=@tas q=@tas]) - :~ [%$ %zuse] - [%a %ames] - [%c %clay] - [%d %dill] - [%e %eyre] - [%f %ford] - [%g %gall] - [%t %time] - == - |= [p=@tas q=@tas] - =+ way=`path`(welp top /[q]) - =+ txt=((hard ,@) .^(%cx (welp way /hoon))) - [ost %flog /reset %veer p way txt] - :: - ++ he-wish-reload - |= all=(list term) - %_ +>.$ - moz - %- weld - :_ moz - %+ turn all - =+ ark=(arch .^(%cy /(scot %p our.hid)/base/(scot %da lat.hid)/arvo)) - =+ van=(~(tap by r.ark)) - |= nam=@tas - =. nam - ?. =(1 (met 3 nam)) - nam - =+ ^- zaz=(list ,[p=span ~]) - (skim van |=([a=term ~] =(nam (end 3 1 a)))) - ?> ?=([[@ ~] ~] zaz) - `term`p.i.zaz - =+ tip=(end 3 1 nam) - =+ way=[(scot %p our.hid) %home (scot %da lat.hid) %arvo nam %hoon ~] - =+ fil=(,@ .^(%cx way)) - :* ost - %flog - /reload - [%veer ?:(=('z' tip) %$ tip) way (,@ .^(%cx way))] - == - == - :: - ++ he-wish-verb - %_ . - moz - :_ moz - [ost %flog /verb %verb ~] - == - ++ he-wish-init - |= him=ship - %_ +>.$ - moz - :_ moz - [ost %flog /init %crud %hax-init leaf/(scow %p him) ~] - == - -- -:: -++ hake :: poke core - |= [ost=bone src=ship] - ?> =(src our.hid) - ~(. he [ost ~] (fall (~(get by hoc) ost) *helm-session)) -:: -++ poke-helm-reset - |= [from ~] - ~& %poke-helm-reset - he-abet:he-wish-reset:(hake ost src) -:: -++ poke-helm-verb - |= [from ~] - ~& %poke-helm-verb - he-abet:he-wish-verb:(hake ost src) -:: -++ poke-helm-init - |= [from him=ship] - ~& %poke-helm-init - he-abet:(he-wish-init:(hake ost src) him) -:: -++ poke-helm-reload - |= [from all=(list term)] - he-abet:(he-wish-reload:(hake ost src) all) -:: -++ poke-helm-start - |= [from dap=term] - he-abet:(he-wish-start:(hake ost src) dap) -:: -++ poke-helm-begin - |= [from begs] - ~& %behn-helm-begin - ?> ?=(~ bur) - =+ buz=(shax :(mix (jam ges) eny)) - =+ loy=(bruw 2.048 buz) - :_ +>.$(bur `[his [0 sec:ex:loy]~]) - :~ :* ost %want /ticketing [our.hid (sein his)] /q/ta - his tic ges pub:ex:loy - == - == -:: -++ poke-will - |= [from wil=(unit will)] - ?> ?=(^ bur) - :_ +>.$(bur ~) - ?~ wil - !! - :~ [ost %cash ~ p.u.bur q.u.bur u.wil] - [ost %plug ~ our.hid %main (sein our.hid) %main] - [ost %plug ~ our.hid %arvo (sein our.hid) %arvo] - [ost %plug ~ our.hid %try (sein our.hid) %try] - == -:: -++ onto - |= [then saw=(each suss tang)] - :_ +> :_ ~ - ?- -.saw - %| [ost %pass ~ %flog %crud `@tas`-.way `tang`p.saw] - %& [ost %pass ~ %flog %text "<{}>"] - == --- diff --git a/base/ape/hood/core.hook b/base/ape/hood/core.hook index 3bb123ffd..a037be6ae 100644 --- a/base/ape/hood/core.hook +++ b/base/ape/hood/core.hook @@ -15,11 +15,11 @@ %kiln ?>(?=(%kiln -.paw) `kiln-part`paw) :: == :: ++ hood-head ,_-:*hood-part :: - ++ hood-mold :: - |= hed=hood-head :: + ++ hood-make :: + |* hed=hood-head :: ?- hed :: - %helm helm-part :: - %kiln kiln-part :: + %helm *helm-part :: + %kiln *kiln-part :: == :: ++ hood-part :: $? helm-part :: @@ -35,7 +35,8 @@ ++ able :: find/make part |* hed=hood-head =+ rep=(~(get by lac) hed) - ((hood-good hed) ?^(rep u.rep `hood-part`*(hood-mold hed))) + =+ par=?^(rep u.rep `hood-part`(hood-make hed)) + ((hood-good hed) par) :: ++ ably :: save part |* [moz=(list) rep=hood-part] @@ -75,11 +76,11 @@ |= [from hood-merge] (ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+)) :: -++ poke-hood-sync :: +++ poke-hood-sync :: |= [from hood-sync] (ably (poke-sync:(kiln-work [hid +<-] (able %kiln)) +<+)) :: -++ poke-hood-unix :: +++ poke-hood-unix :: |= [from hood-unix] (ably (poke-unix:(kiln-work [hid +<-] (able %kiln)) +<+)) :: @@ -99,8 +100,12 @@ |= [then saw=(unit tang)] (ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+)) :: -++ coup-kiln-spam +++ coup-kiln-spam :: |= [then saw=(unit tang)] ~? ?=(^ saw) [%kiln-spam-lame u.saw] [~ +>] +:: +++ went-helm :: + |= [then her=ship kay=cape] + (ably (take-went:(helm-work [hid ost src] (able %helm)) way +<+)) -- diff --git a/base/ape/talk/core.hook b/base/ape/talk/core.hook index 6d4523b40..51038f566 100644 --- a/base/ape/talk/core.hook +++ b/base/ape/talk/core.hook @@ -1714,7 +1714,7 @@ ra-abet:(~(ra-quit ra ost ~) man cuz) :: ++ pull :: - |= [from ~] + |= [from *] ^- [(list move) _+>] :: ~& [%talk-pull `*`ost] =^ moz +>.$ ra-abet:ra-ever:~(ra-cancel ra ost ~) diff --git a/base/arvo/ames.hoon b/base/arvo/ames.hoon index 27e05c7dc..5f6d77cff 100644 --- a/base/arvo/ames.hoon +++ b/base/arvo/ames.hoon @@ -4,43 +4,7 @@ => =~ :: structures |% -++ flog :: error wrapper - $% [%crud p=@tas q=(list tank)] :: - [%text p=tape] :: - == :: -++ cuft :: internal gift - $% [%coup p=(unit tang)] :: poke result - [%diff p=cage] :: subscription output - [%quit ~] :: close subscription - [%reap p=(unit tang)] :: peer result - == :: -++ gift :: out result <-$ - $% [%hear p=lane q=@] :: receive packet - [%init p=@p] :: report install - [%mass p=mass] :: memory usage - [%send p=lane q=@] :: transmit packet - [%waft p=sock q=*] :: response message - [%wart p=sock q=@tas r=path s=*] :: network request - [%went p=ship q=cape] :: reaction message - [%woot p=ship q=coop] :: e2e reaction message - == :: -++ hasp ,[p=ship q=term] :: see %gall -++ kiss :: in request ->$ - $% [%barn ~] :: new unix process - [%crud p=@tas q=(list tank)] :: error with trace - [%cash p=@p q=buck] :: civil license - [%hear p=lane q=@] :: receive packet - [%hole p=lane q=@] :: packet failed - [%junk p=@] :: entropy - [%kick p=@da] :: wake up - [%make p=(unit ,@t) q=@ud r=@ s=?] :: wild license - [%sith p=@p q=@uw r=?] :: imperial generator - [%wake ~] :: timer activate - [%want p=sock q=path r=*] :: send message - [%wegh ~] :: report memory - [%wont p=sock q=path r=*] :: e2e send message - == :: -++ move ,[p=duct q=(mold note gift)] :: local move +++ move ,[p=duct q=(mold note gift-ames)] :: local move ++ note :: out request $-> $? $: %d :: to %dill $% [%flog p=flog] :: @@ -490,7 +454,9 @@ ^- [(unit will) _+>] ?. =(our (sein her)) [~ +>.$] =+ nes=sen - ?. =(tic (end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes))))) + =+ ryt=(end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes)))) + ?. =(tic ryt) + ~& [%ames-wrong-ticket `@p`ryt] [~ +>.$] =+ rad=(~(get by hoc.saf) her) ?^ rad @@ -1596,16 +1562,16 @@ |% :: vane interface ++ call :: handle request |= $: hen=duct - hic=(hypo (hobo kiss)) + hic=(hypo (hobo kiss-ames)) == => %= . :: XX temporary q.hic - ^- kiss + ^- kiss-ames ?: ?=(%soft -.q.hic) - ((hard kiss) p.q.hic) - ?: (~(nest ut -:!>(*kiss)) | p.hic) q.hic + ((hard kiss-ames) p.q.hic) + ?: (~(nest ut -:!>(*kiss-ames)) | p.hic) q.hic ~& [%ames-call-flub (,@tas `*`-.q.hic)] - ((hard kiss) q.hic) + ((hard kiss-ames) q.hic) == ^- [p=(list move) q=_..^$] =^ duy ..knob @@ -1707,7 +1673,7 @@ :+ (scot %p p.p.bon) (scot %p q.p.bon) q.q.bon - [hen %pass pax %g %rote p.bon /helm 0 %m %will wil]~ + [hen %pass pax %g %rote p.bon /hood 0 %m %will wil]~ ?> ?=([@ @ *] t.q.q.bon) :_ fox =+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon] @@ -1760,7 +1726,7 @@ == :: %ye :: %ye - :: ~& [%ye bon] + :: ~& [%ye bon] ?> =(p.p.bon (sein q.p.bon)) =+ ^= paz ^- (list ,@p) %+ skim pals:(~(um am [now fox]) p.p.bon) @@ -1855,7 +1821,7 @@ == :: ++ knob - |= [hen=duct kyz=kiss] + |= [hen=duct kyz=kiss-ames] ^- [(list move) _+>] ?: ?=(%crud -.kyz) [[[hen [%slip %d %flog kyz]] ~] +>] diff --git a/base/arvo/behn.hoon b/base/arvo/behn.hoon deleted file mode 100644 index 9a30bac2b..000000000 --- a/base/arvo/behn.hoon +++ /dev/null @@ -1,1162 +0,0 @@ -!: :: %behn, agent execution -!? 163 -:::: -|= pit=vase -=> =~ -|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: rest of arvo - :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ hood :: assembly plan - $: zus=@ud :: zuse kelvin - sur=(list hoot) :: structures - lib=(list hoof) :: libraries - fan=(list horn) :: resources - src=(list hoop) :: program - == :: -++ hoof (pair term (unit (pair case ship))) :: resource reference -++ hoot (pair bean hoof) :: structure gate/core -++ hoop :: source in hood - $% [%& p=twig] :: direct twig - [%| p=beam] :: resource location - == :: -++ horn :: resource tree - $% [%ape p=twig] :: /~ twig by hand - [%arg p=twig] :: /$ argument - [%day p=horn] :: /| list by @dr - [%dub p=term q=horn] :: /= apply face - [%fan p=(list horn)] :: /. list - [%for p=path q=horn] :: /, descend - [%hel p=@ud q=horn] :: /% propagate heel - [%hub p=horn] :: /@ list by @ud - [%man p=(map span horn)] :: /* hetero map - [%nap p=horn] :: /_ homo map - [%now p=horn] :: /& list by @da - [%saw p=twig q=horn] :: /; operate on - [%see p=beam q=horn] :: /: relative to - [%sic p=tile q=horn] :: /^ cast - [%toy p=mark] :: /mark/ static - == :: -++ milk (trel ship desk silk) :: sourced silk -++ silk :: construction layer - $& [p=silk q=silk] :: cons - $% [%bake p=mark q=beam r=path] :: local synthesis - [%boil p=mark q=beam r=path] :: general synthesis - [%bunt p=mark] :: example of mark - [%call p=silk q=silk] :: slam - [%cast p=mark q=silk] :: translate - [%diff p=silk q=silk] :: diff - [%done p=(set beam) q=gage] :: literal - [%dude p=tank q=silk] :: error wrap - [%dune p=(set beam) q=(unit gage)] :: unit literal - [%file p=beam] :: from clay - [%join p=mark q=silk r=silk] :: merge - [%mash p=mark q=milk r=milk] :: annotate - [%mute p=silk q=(list (pair wing silk))] :: mutant - [%pact p=silk q=silk] :: patch - [%plan p=beam q=spur r=hood] :: structured assembly - [%reef ~] :: kernel reef - [%ride p=twig q=silk] :: silk thru twig - [%tabl p=(list (pair silk silk))] :: list - [%vale p=mark q=ship r=*] :: validate [our his] - [%volt p=(set beam) q=(cask ,*)] :: unsafe add type - == :: -++ volt ?(%low %high) :: voltage -++ torc $|(?(%iron %gold) [%lead p=ship]) :: security control -++ roon :: reverse ames msg - $% [%d p=mark q=*] :: diff (diff) - [%x ~] :: - == :: -++ rook :: forward ames msg - $% [%m p=mark q=*] :: message - [%s p=path] :: subscribe - [%u ~] :: cancel/unsubscribe - == :: --- :: -|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: local arvo - :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ club :: agent action - $% [%peer p=path] :: subscribe - [%poke p=cage] :: apply - [%pull ~] :: unsubscribe - [%pump ~] :: subscription ack - == :: -++ culm :: config action - $% [%load p=scup] :: load/reload - :: [%kick ~] :: restart everything - :: [%stop ~] :: toggle suspend - :: [%wipe ~] :: destroy all state - == :: -++ cuss (pair dude club) :: internal kiss -++ cuft :: internal gift - $% [%coup p=(unit tang)] :: poke result - [%diff p=cage] :: subscription output - [%quit ~] :: close subscription - [%reap p=(unit tang)] :: peer result - == :: -++ cote :: ++ap note - $% [%meta p=@tas q=vase] :: - [%send p=ship q=cuss] :: - == :: -++ cove (pair duct (mold cote cuft)) :: internal move -++ cute (pair bone (mold cote cuft)) :: internal move -++ dude term :: local identity -++ scup (pair ship desk) :: autoupdate -++ suss (trel dude ,@tas ,@da) :: config report -++ tang (list tank) :: error abstraction --- :: -|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: %behn cards - :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ kiss-ames :: - $% [%wont p=sock q=path r=*] :: - == :: -++ kiss-behn :: incoming request - $% [%conf p=dock q=culm] :: configure app - [%init p=ship] :: set owner - [%deal p=sock q=cuss] :: full transmission - [%rote p=sack q=path r=*] :: remote request - [%roth p=sack q=path r=*] :: remote response - == :: -++ kiss-ford :: - $% [%exec p=@p q=beak r=(unit silk)] :: make / kill - [%wasp p=@p q=@uvH] :: depends query - == :: -++ gift-ames :: - $% [%woot p=ship q=(unit ares)] :: e2e reaction message - == :: -++ gift-behn :: outgoing result - $% [%onto p=(each suss tang)] :: about agent - [%unto p=cuft] :: within agent - [%mack p=(unit tang)] :: message ack - == :: -++ gift-ford :: out result <-$ - $% [%made p=@uvH q=(each gage tang)] :: computed result - [%news ~] :: fresh depends - == :: -++ sign-behn :: incoming result - $% [%a gift-ames] :: - [%b gift-behn] :: - [%f gift-ford] :: - == :: -++ note-behn :: outgoing request - $? [@tas %meta p=vase] :: - $% [%a kiss-ames] :: - [%b kiss-behn] :: - [%f kiss-ford] :: - == == :: -++ move ,[p=duct q=(mold note-behn gift-behn)] :: typed move --- :: -|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: %behn state - :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ axle :: all state - $: %0 :: state version - pol=(map ship mast) :: apps by ship - == :: -++ gest :: subscriber data - $: sup=(map bone (pair ship path)) :: subscribers - pus=(jug path bone) :: srebircsbus - qel=(map bone ,@ud) :: queue meter - == :: -++ mast :: ship state - $: sys=duct :: system duct - sap=(map ship scad) :: foreign contacts - bum=(map dude seat) :: running agents - wub=(map dude sofa) :: waiting queue - == :: -++ ffuc :: new cuff - $: p=(unit (set ship)) :: disclosing to - q=ship :: attributed to - == :: -++ prey (pair volt ffuc) :: privilege -++ scad :: foreign connection - $: p=@ud :: index - q=(map duct ,@ud) :: by duct - r=(map ,@ud duct) :: by index - == :: -++ scar :: opaque input - $: p=@ud :: bone sequence - q=(map duct bone) :: by duct - r=(map bone duct) :: by bone - == :: -++ seat :: agent state - $: mom=duct :: control duct - liv=? :: unstopped - toc=torc :: privilege - tyc=stic :: statistics - ged=gest :: subscribers - hav=vase :: running state - pup=scup :: update control - zam=scar :: opaque ducts - == :: -++ sofa :: queue for blocked - $: kys=(qeu (trel duct prey club)) :: queued kisses - == :: -++ stic :: statistics - $: act=@ud :: change number - eny=@uvI :: entropy - lat=@da :: time - == :: --- :: - :::::::::::::::::::::::::::::::::::::::::::::::::::::: vane header - :::::::::::::::::::::::::::::::::::::::::::::::::::::: -. == -=| all=axle :: all vane state -|= $: now=@da :: urban time - eny=@uvI :: entropy - ska=sled :: activate - == :: opaque core -|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: state machine - :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ mo - |_ $: $: our=@p - hen=duct - moz=(list move) - == - mast - == - ++ mo-abed :: initialize - |= [our=@p hen=duct] - ^+ +> - %_ +> - our our - hen hen - +<+ (~(got by pol.all) our) - == - :: - ++ mo-abet :: resolve to - ^- [(list move) _+>+] - :_ +>+(pol.all (~(put by pol.all) our +<+)) - %- flop - %+ turn moz - |= a=move - ?. ?=(%pass -.q.a) a - [p.a %pass [(scot %p our) p.q.a] q.q.a] - :: - ++ mo-conf :: configure - |= [dap=dude lum=culm] - (mo-boot dap ?:((~(has by bum) dap) %old %new) p.lum) - :: - ++ mo-pass :: standard pass - |= [pax=path noh=note-behn] - %_(+> moz :_(moz [hen %pass pax noh])) - :: - ++ mo-give - |= git=gift-behn - %_(+> moz :_(moz [hen %give git])) - :: - ++ mo-okay :: valid agent core - |= vax=vase - ^- ? - (~(nest ut -:!>(*hide)) %| p:(slot 12 vax)) - :: - ++ mo-boom :: complete new boot - |= [dap=dude pup=scup dep=@uvH gux=(each gage tang)] - ^+ +> - ?- -.gux - %| (mo-give %onto %| p.gux) - %& - ?> ?=(@ p.p.gux) - ?. (mo-okay q.p.gux) - (mo-give %onto %| [%leaf "{}: bogus core"]~) - =. +> (mo-bold dap dep) - =. +> (mo-born dap pup q.p.gux) - =+ old=+>.$ - =+ wag=(ap-prop:(ap-abed:ap dap [%high [~ our]]) ~) - ?^ -.wag - =. +>.$ old - (mo-give %onto %| u.-.wag) - =. +>.$ ap-abet:+.wag - (mo-give:(mo-claw dap) %onto %& dap %boot now) - == - :: - ++ mo-born :: new seat - |= [dap=dude pup=scup hav=vase] - =+ sat=*seat - %_ +>.$ - bum - %+ ~(put by bum) dap - %_ sat - mom hen - pup pup - hav hav - p.zam 1 - q.zam [[[~ ~] 0] ~ ~] - r.zam [[0 [~ ~]] ~ ~] - == - == - :: - ++ mo-boon :: complete old boot - |= [dap=dude pup=scup dep=@uvH gux=(each gage tang)] - ^+ +> - ?. (~(has by bum) dap) - ~& [%behn-old-boon dap] - +> - =. +> (mo-bold dap dep) - ?- -.gux - %| (mo-give %onto %| p.gux) - %& ?> ?=(@ p.p.gux) - ap-abet:(ap-peep:(ap-abed:ap dap [%high [~ our]]) q.p.gux) - == - :: - ++ mo-bold :: wait for dep - |= [dap=dude dep=@uvH] - ^+ +> - %+ mo-pass [%sys %dep dap ~] - [%f %wasp our dep] - :: - ++ mo-boot :: create ship - |= [dap=dude how=?(%new %old) pup=scup] - ^+ +> - :: ~& [%mo-boot dap how pup] - %+ mo-pass [%sys how dap (scot %p p.pup) q.pup ~] - =+ bek=[p.pup q.pup [%da now]] - ^- note-behn - [%f %exec our bek `[%boil %core [bek [dap %ape ~]] ~]] - :: - ++ mo-away :: foreign request - |= [him=ship caz=cuss] :: - ^+ +> - :: ~& [%mo-away him caz] - ?: ?=(%pump -.q.caz) - :: - :: you'd think this would send an ack for the diff - :: that caused this pump. it would, but we already - :: sent it when we got the diff in ++mo-cyst. then - :: we'd have to save the network duct and connect it - :: to this returning pump. - :: - +> - =^ num +>.$ (mo-bale him) - =+ ^= roc ^- rook - ?- -.q.caz - %poke [%m p.p.q.caz q.q.p.q.caz] - %pull [%u ~] - %peer [%s p.q.caz] - == - %+ mo-pass - [%sys %way -.q.caz ~] - `note-behn`[%a %wont [our him] [%q %be p.caz ~] [num roc]] - :: - ++ mo-baal :: error convert a - |= art=(unit ares) - ^- ares - ?~(art ~ ?~(u.art `[%blank ~] u.art)) - :: - ++ mo-baba :: error convert b - |= ars=ares - ^- (unit tang) - ?~ ars ~ - `[[%leaf (trip p.u.ars)] q.u.ars] - :: - ++ mo-awed :: foreign response - |= [him=ship why=?(%peer %poke %pull) art=(unit ares)] - ^+ +> - :: ~& [%mo-awed him why art] - =+ tug=(mo-baba (mo-baal art)) - ?- why - %peer (mo-give %unto %reap tug) - %poke (mo-give %unto %coup tug) - %pull ~& [%pull-fail tug] - +>.$ - == - :: - ++ mo-bale :: assign outbone - |= him=ship - ^- [@ud _+>] - =+ sad=(fall (~(get by sap) him) `scad`[1 ~ ~]) - =+ nom=(~(get by q.sad) hen) - ?^ nom [u.nom +>.$] - :- p.sad - %_ +>.$ - sap - %+ ~(put by sap) him - %_ sad - p +(p.sad) - q (~(put by q.sad) hen p.sad) - r (~(put by r.sad) p.sad hen) - == - == - :: - ++ mo-ball :: outbone by index - |= [him=ship num=@ud] - ^- duct - (~(got by r:(~(got by sap) him)) num) - :: - ++ mo-come :: handle locally - |= [her=ship caz=cuss] - ^+ +> - =+ pry=`prey`[%high [~ her]] - (mo-club p.caz pry q.caz) - :: - ++ mo-coup :: back from mo-away - |= [dap=dude him=ship cup=ares] - %^ mo-give %unto %coup - ?~ cup ~ - [~ `tang`[[%leaf (trip p.u.cup)] q.u.cup]] - :: - ++ mo-cyst :: take in /sys - |= [pax=path sih=sign-behn] - ^+ +> - ?+ -.pax !! - %dep :: update - ?> ?=([%f %news *] sih) - ?> ?=([@ ~] t.pax) - =+ sot=(~(get by bum) i.t.pax) - ?~ sot - ~& [%mo-cyst-none i.t.pax] - +>.$ - (mo-boot i.t.pax %old pup.u.sot) - :: - %new - ?> ?=([%f %made *] sih) - ?> ?=([@ @ @ ~] t.pax) - (mo-boom i.t.pax [(slav %p i.t.t.pax) i.t.t.t.pax] +>.sih) - :: - %old :: reload old - ?> ?=([%f %made *] sih) - ?> ?=([@ @ @ ~] t.pax) - (mo-boon i.t.pax [(slav %p i.t.t.pax) i.t.t.t.pax] +>.sih) - :: - %red :: diff ack - ?> ?=([@ @ @ ~] t.pax) - ?> ?=([%a %woot *] sih) - =+ :* him=(slav %p i.t.pax) - dap=i.t.t.pax - num=(slav %ud i.t.t.t.pax) - == - => .(pax `path`[%req t.pax]) - ?~ q.+>.sih - (mo-pass [%sys pax] %b %deal [him our] dap %pump ~) - ~& [%diff-bad-ack q.+>.sih] :: should not happen - =. +>.$ (mo-pass [%sys pax] %b %deal [him our] dap %pull ~) - (mo-pass [%sys pax] %a %wont [our him] [%q %bh dap ~] [num %x ~]) - :: - %rep :: reverse request - ?> ?=([@ @ @ ~] t.pax) - ?> ?=([%f %made *] sih) - =+ :* him=(slav %p i.t.pax) - dap=i.t.t.pax - num=(slav %ud i.t.t.t.pax) - == - ?- -.q.+>.sih - %| (mo-give %mack `p.q.+>.sih) :: XX should crash - %& ?> ?=(@ p.p.q.+>.sih) - =. +>.$ (mo-give %mack ~) :: XX pump should ack - (mo-give(hen (mo-ball him num)) %unto %diff `cage`p.q.+>.sih) - == - :: - %req :: inbound request - ?> ?=([@ @ @ ~] t.pax) - =+ :* him=(slav %p i.t.pax) - dap=i.t.t.pax - num=(slav %ud i.t.t.t.pax) - == - ?: ?=([%f %made *] sih) - ?- -.q.+>.sih - %| (mo-give %mack `p.q.+>.sih) :: XX should crash - %& ?> ?=(@ p.p.q.+>.sih) - (mo-pass [%sys pax] %b %deal [him our] i.t.t.pax %poke p.q.+>.sih) - == - ?: ?=([%a %woot *] sih) +>.$ :: quit ack, boring - ?> ?=([%b %unto *] sih) - =+ cuf=`cuft`+>.sih - ?- -.cuf - %coup (mo-give %mack p.cuf) - %diff %+ mo-pass [%sys %red t.pax] - [%a %wont [our him] [%q %bh dap ~] [num %d p.p.cuf q.q.p.cuf]] - %quit %+ mo-pass [%sys pax] - [%a %wont [our him] [%q %bh dap ~] [num %x ~]] - %reap (mo-give %mack p.cuf) - == - :: - %way :: outbound request - ?> ?=([%a %woot *] sih) - ?> ?=([@ ~] t.pax) - %- mo-awed - :* p.+>.sih - (?(%peer %poke %pull) i.t.pax) - +>+.sih - == - == - :: - ++ mo-cook :: take in /use - |= [pax=path hin=(hypo sign-behn)] - ^+ +> - ?. ?=([@ @ ?(%inn %out) *] pax) - ~& [%mo-cook-bad-pax pax] - !! - =+ dap=`@tas`i.pax - =+ pry=`prey`[%high [~ (slav %p i.t.pax)]] - =+ pap=(ap-abed:ap dap pry) - =+ vax=(slot 3 `vase`hin) - ?- i.t.t.pax - %inn ap-abet:(ap-pour:pap t.t.t.pax (slot 3 `vase`hin)) - %out ?. ?=([%b %unto *] q.hin) - ~& [%mo-cook-weird q.hin] - ~& [%mo-cook-weird-path pax] - +>.$ - ap-abet:(ap-pout:pap t.t.t.pax +>.q.hin) - == - :: - ++ mo-claw :: clear queue - |= dap=dude - ^+ +> - ?. (~(has by bum) dap) +> - =+ suf=(~(get by wub) dap) - =+ neh=hen - ?~ suf +>.$ - |- ^+ +>.^$ - ?: =(~ kys.u.suf) - +>.^$(hen neh, wub (~(del by wub) dap)) - =^ lep kys.u.suf [p q]:~(get to kys.u.suf) - :: ~& [%mo-claw-play dap r.lep] - $(+>.^$ ap-abet:(ap-club:(ap-abed:ap(hen p.lep) dap q.lep) r.lep)) - :: - ++ mo-beak :: build beak - |= dap=dude - ^- beak - :: =+ pup=pup:(~(got by bum) dap) - :: [p.pup q.pup [%da now]] :: XX this is wrong; save the build case - [our %base %da now] :: XX really wrong - :: - ++ mo-club :: local action - |= [dap=dude pry=prey cub=club] - ^+ +> - ?: |(!(~(has by bum) dap) (~(has by wub) dap)) - :: ~& [%mo-club-qeu dap cub] - =+ syf=(fall (~(get by wub) dap) *sofa) - +>.$(wub (~(put by wub) dap syf(kys (~(put to kys.syf) [hen pry cub])))) - ap-abet:(ap-club:(ap-abed:ap dap pry) cub) - :: - ++ mo-gawk :: ames forward - |= [him=@p dap=dude num=@ud rok=rook] - %+ mo-pass - [%sys %req (scot %p him) dap (scot %ud num) ~] - ^- note-behn - ?- -.rok - %m [%f %exec our (mo-beak dap) ~ %vale p.rok our q.rok] - %s [%b %deal [him our] dap %peer p.rok] - %u [%b %deal [him our] dap %pull ~] - == - :: - ++ mo-gawd :: ames backward - |= [him=@p dap=dude num=@ud ron=roon] - ?- -.ron - %d - %+ mo-pass - [%sys %rep (scot %p him) dap (scot %ud num) ~] - [%f %exec our (mo-beak dap) ~ %vale p.ron our q.ron] - :: - %x (mo-give(hen (mo-ball him num)) %unto %quit ~) - == - :: - ++ ap :: agent engine - |_ $: $: dap=dude - pry=prey - ost=bone - zip=(list cute) - dub=(list (each suss tang)) - == - seat - == - :: - ++ ap-abed :: initialize - |= [dap=dude pry=prey] - ^+ +> - =: ^dap dap - ^pry pry - +>+<+ `seat`(~(got by bum) dap) - == - =+ unt=(~(get by q.zam) hen) - =: act.tyc +(act.tyc) - eny.tyc (shax (mix (add dap act.tyc) eny)) - lat.tyc now - == - ?^ unt - +>.$(ost u.unt) - %= +>.$ - ost p.zam - p.zam +(p.zam) - q.zam (~(put by q.zam) hen p.zam) - r.zam (~(put by r.zam) p.zam hen) - == - :: - ++ ap-abet :: resolve - ^+ +> - => ap-abut - %_ +> - bum (~(put by bum) dap +<+) - moz :(weld (turn zip ap-aver) (turn dub ap-avid) moz) - == - :: - ++ ap-abut :: track queue - ^+ . - =+ [pyz=zip ful=*(set bone)] - |- ^+ +> - ?~ pyz - =+ ded=(~(tap in ful) ~) - |- ^+ +>.^$ - ?~ ded +>.^$ - $(ded t.ded, +>.^$ ap-kill(ost i.ded)) - ?. ?=([%give %diff *] q.i.pyz) - $(pyz t.pyz) - =^ vad +> ap-fill(ost p.i.pyz) - $(pyz t.pyz, ful ?:(vad ful (~(put in ful) p.i.pyz))) - :: - ++ ap-aver :: cute to move - |= cov=cute - ^- move - :- (~(got by r.zam) p.cov) - ?- -.q.cov - ?(%slip %sick) !! - %give ?<(=(0 p.cov) [%give %unto p.q.cov]) - %pass - :+ %pass `path`[%use dap p.q.cov] - ?- -.q.q.cov - %send `note-behn`[%b %deal [our p.q.q.cov] q.q.q.cov] - %meta `note-behn`[`@tas`p.q.q.cov %meta `vase`q.q.q.cov] - == - == - :: - ++ ap-avid :: onto results - |=([a=(each suss tang)] [hen %give %onto a]) - :: - ++ ap-call :: call into server - |= [cog=term arg=vase] - ^- [(unit tang) _+>] - =. +> ap-hide - =+ arm=(ap-farm cog) - ?: ?=(%| -.arm) [`p.arm +>.$] - =+ zem=(ap-slam cog p.arm arg) - ?: ?=(%| -.zem) [`p.zem +>.$] - (ap-sake p.zem) - :: - ++ ap-club :: apply effect - |= cub=club - ^+ +> - ?- -.cub - %poke (ap-poke +.cub) - %peer (ap-peer +.cub) - %pull ap-pull - %pump ap-fall - == - :: - ++ ap-diff :: pour a diff - |= [her=ship pax=path cag=cage] - =. q.cag (spec q.cag) - =+ cug=(ap-find [%diff p.cag pax]) - ?~ cug - (ap-pump:(ap-lame %diff (ap-suck "pour: no diff")) | her pax) - =+ ^= arg ^- vase - %- slop - ?: =(0 p.u.cug) - [!>([`@ud`ost `@p`q.q.pry `path`+.pax]) !>(cag)] - [!>([`@ud`ost `@p`q.q.pry (slag (dec p.u.cug) `path`+.pax)]) q.cag] - =^ cam +>.$ (ap-call q.u.cug arg) - ?^ cam - (ap-pump:(ap-lame q.u.cug u.cam) | her pax) - (ap-pump & her pax) - :: - ++ ap-pump :: break subscription - |= [oak=? her=ship pax=path] - =+ way=[(scot %p her) %out pax] - :: ~& [%ap-pump-path oak pax] - ?: oak - (ap-pass way %send her -.pax %pump ~) - (ap-pass:(ap-give %quit ~) way %send her -.pax %pull ~) - :: - ++ ap-fall :: drop from queue - ^+ . - =+ soy=(~(get by qel.ged) ost) - ?: |(?=(~ soy) =(0 u.soy)) - ~& [%ap-fill-under [our dap] q.q.pry ost] - + - =. u.soy (dec u.soy) - :: ~& [%ap-fill-sub [[our dap] q.q.pry ost] u.soy] - ?: =(0 u.soy) - +(qel.ged (~(del by qel.ged) ost)) - +(qel.ged (~(put by qel.ged) ost u.soy)) - :: - ++ ap-farm :: produce arm - |= cog=term - ^- (each vase tang) - =+ puz=(mule |.((~(mint ut p.hav) [%noun [%cnzy cog]]))) - ?: ?=(%| -.puz) [%| p.puz] - =+ ton=(mock [q.hav q.p.puz] ap-sled) - ?- -.ton - %0 [%& p.p.puz p.ton] - %1 [%| (turn p.ton |=(a=* (smyt (path a))))] - %2 [%| p.ton] - == - :: - ++ ap-fill :: add to queue - ^- [? _.] - =+ suy=(fall (~(get by qel.ged) ost) 0) - ?: =(8 suy) - ~& [%ap-fill-full [our dap] q.q.pry ost] - [%| +] - :: ~? !=(8 suy) [%ap-fill-add [[our dap] q.q.pry ost] +(suy)] - [%& +(qel.ged (~(put by qel.ged) ost +(suy)))] - :: - ++ ap-find :: general arm - |= [cog=term pax=path] - =+ dep=0 - |- ^- (unit (pair ,@ud term)) - =+ ^= spu - ?~ pax ~ - $(pax t.pax, dep +(dep), cog (ap-hype cog i.pax)) - ?^ spu spu - ?.((ap-fond cog) ~ `[dep cog]) - :: - ++ ap-fond :: check for arm - |= cog=term - ^- ? - (slob cog p.hav) - :: - ++ ap-give :: return result - |= cit=cuft - ^+ +> - +>(zip :_(zip [ost %give cit])) - :: - ++ ap-hide :: set up hide - %_ . - +12.q.hav - ^- hide - :* :* our - dap - ~ - == - ~ - sup.ged - pus.ged - tyc - == - == - :: - ++ ap-hype :: hyphenate - |=([a=term b=term] `term`(cat 3 a (cat 3 '-' b))) - :: - ++ ap-move :: process each move - |= vax=vase - ^- (each cute tang) - ?@ q.vax [%| (ap-suck "move: invalid move (atom)")] - ?^ -.q.vax [%| (ap-suck "move: invalid move (bone)")] - ?@ +.q.vax [%| (ap-suck "move: invalid move (card)")] - =+ hun=(~(get by r.zam) -.q.vax) - ?. (~(has by r.zam) -.q.vax) - [%| (ap-suck "move: invalid card (bone {<-.q.vax>})")] - =+ cav=(slot 3 (spec (slot 3 vax))) - ?+ +<.q.vax - (ap-move-pass -.q.vax +<.q.vax cav) - %diff (ap-move-diff -.q.vax cav) - %peer (ap-move-peer -.q.vax cav) - %pull (ap-move-pull -.q.vax cav) - %poke (ap-move-poke -.q.vax cav) - %send (ap-move-send -.q.vax cav) - %quit (ap-move-quit -.q.vax cav) - == - :: - ++ ap-move-quit :: give quit move - |= [sto=bone vax=vase] - ^- (each cute tang) - ?^ q.vax [%| (ap-suck "move: improper quit")] - [%& `cute`[sto %give `cuft`[%quit ~]]] - :: - ++ ap-move-diff :: give diff move - |= [sto=bone vax=vase] - ^- (each cute tang) - ?. &(?=(^ q.vax) ?=(@ -.q.vax) ((sane %tas) -.q.vax)) - [%| (ap-suck "move: improper diff")] - [%& sto %give %diff `cage`[-.q.vax (slot 3 vax)]] - :: - ++ ap-move-mess :: extract path, target - |= vax=vase - ^- (each (trel path ship term) tang) - ?. ?& ?=([p=* [q=@ r=@] s=*] q.vax) - (gte 1 (met 7 q.q.vax)) - == - [%| (ap-suck "move: malformed target")] - =+ pux=((soft path) p.q.vax) - ?. &(?=(^ pux) (levy u.pux (sane %ta))) - [%| (ap-suck "move: malformed path")] - [%& [(scot %p q.q.vax) %out r.q.vax u.pux] q.q.vax r.q.vax] - :: - ++ ap-move-pass :: pass general move - |= [sto=bone wut=* vax=vase] - ^- (each cute tang) - ?. &(?=(@ wut) ((sane %tas) wut)) - [%| (ap-suck "move: malformed card")] - =+ pux=((soft path) -.q.vax) - ?. &(?=(^ pux) (levy u.pux (sane %ta))) - [%| (ap-suck "move: malformed path")] - =+ huj=(ap-vain wut) - ?~ huj [%| (ap-suck "move: unknown note {(trip wut)}")] - :^ %& sto %pass - :- [(scot %p q.q.pry) %inn u.pux] - [%meta u.huj (slop (ap-term %tas wut) (slot 3 vax))] - :: - ++ ap-move-poke :: pass %poke - |= [sto=bone vax=vase] - ^- (each cute tang) - =+ yep=(ap-move-mess vax) - ?: ?=(%| -.yep) yep - =+ gaw=(slot 7 vax) - ?. &(?=([p=@ q=*] q.gaw) ((sane %tas) p.q.gaw)) - [%| (ap-suck "poke: malformed cage")] - :^ %& sto %pass - :- p.p.yep - [%send q.p.yep r.p.yep %poke p.q.gaw (slot 3 (spec gaw))] - :: - ++ ap-move-peer :: pass %peer - |= [sto=bone vax=vase] - ^- (each cute tang) - =+ yep=(ap-move-mess vax) - ?: ?=(%| -.yep) yep - =+ pux=((soft path) +>.q.vax) - ?. &(?=(^ pux) (levy u.pux (sane %ta))) - [%| (ap-suck "peer: malformed path")] - :^ %& sto %pass - :- p.p.yep - [%send q.p.yep r.p.yep %peer u.pux] - :: - ++ ap-move-pull :: pass %pull - |= [sto=bone vax=vase] - ^- (each cute tang) - =+ yep=(ap-move-mess vax) - ?: ?=(%| -.yep) yep - ?. =(~ +>.q.vax) - [%| (ap-suck "pull: malformed card")] - :^ %& sto %pass - :- p.p.yep - [%send q.p.yep r.p.yep %pull ~] - :: - ++ ap-move-send :: pass gall action - |= [sto=bone vax=vase] - ^- (each cute tang) - ?. ?& ?=([p=* [q=@ r=@] [s=@ t=*]] q.vax) - (gte 1 (met 7 q.q.vax)) - ((sane %tas) r.q.vax) - == - [%| (ap-suck "move: malformed send")] - =+ pux=((soft path) p.q.vax) - ?. &(?=(^ pux) (levy u.pux (sane %ta))) - [%| (ap-suck "move: malformed path")] - ?: ?=(%poke s.q.vax) - =+ gav=(spec (slot 7 vax)) - ?> =(%poke -.q.gav) - ?. ?& ?=([p=@ q=*] t.q.vax) - ((sane %tas) p.t.q.vax) - == - [%| (ap-suck "move: malformed poke")] - :^ %& sto %pass - :- [(scot %p q.q.vax) %out r.q.vax u.pux] - ^- cote - :: ~& [%ap-move-send `path`[(scot %p q.q.vax) %out r.q.vax u.pux]] - [%send q.q.vax r.q.vax %poke p.t.q.vax (slot 3 (spec (slot 3 gav)))] - =+ cob=((soft club) [s t]:q.vax) - ?~ cob - [%| (ap-suck "move: malformed club")] - :^ %& sto %pass - :- [(scot %p q.q.vax) %out r.q.vax u.pux] - :: ~& [%ap-move-send `path`[(scot %p q.q.vax) %out r.q.vax u.pux]] - [%send q.q.vax r.q.vax u.cob] - :: - ++ ap-pass :: request action - |= [pax=path coh=cote] - ^+ +> - +>(zip :_(zip [ost %pass pax coh])) - :: - ++ ap-peep :: reinstall - |= vax=vase - ^+ +> - (ap-prep(hav vax) `hav) - :: - ++ ap-peer :: apply %peer - |= pax=path - ^+ +> - =+ cug=(ap-find %peer pax) - ?~ cug - (ap-peon pax) - =^ cam +>.$ - %+ ap-call q.u.cug - !>([[`@ud`ost `@p`q.q.pry] `path`(slag p.u.cug pax)]) - ?^ cam - (ap-give %reap cam) - (ap-give:(ap-peon pax) %reap ~) - :: - ++ ap-peon :: add subscriber - |= pax=path - %_ +>.$ - sup.ged (~(put by sup.ged) ost [q.q.pry pax]) - pus.ged (~(put ju pus.ged) pax ost) - == - :: - ++ ap-poke :: apply %poke - |= cag=cage - ^+ +> - =+ cug=(ap-find %poke p.cag ~) - ?~ cug - (ap-give %coup `(ap-suck "no poke arm")) - :: ~& [%ap-poke dap p.cag cug] - =^ tur +>.$ - %+ ap-call q.u.cug - %+ slop - !>([`@ud`ost `@p`q.q.pry]) - ?. =(0 p.u.cug) q.cag - (slop (ap-term %tas p.cag) q.cag) - (ap-give %coup tur) - :: - ++ ap-lame :: pour error - |= [wut=@tas why=tang] - ^+ +> - =+ cug=(ap-find /lame) - ?~ cug - ~& [%ap-lame wut why] - +>.$ - =^ cam +>.$ - %+ ap-call q.u.cug - !>([[`@ud`ost `@p`q.q.pry] wut why]) - ?^ cam - ~&([%ap-lame-lame u.cam] +>.$) - +>.$ - :: - ++ ap-pour :: generic take - |= [pax=path vax=vase] - ^+ +> - ?. &(?=([@ *] q.vax) ((sane %tas) -.q.vax)) - (ap-lame %pour (ap-suck "pour: malformed card")) - =+ cug=(ap-find [-.q.vax pax]) - ?~ cug - (ap-lame -.q.vax (ap-suck "pour: no {(trip -.q.vax)}: {}")) - =^ cam +>.$ - %+ ap-call q.u.cug - %+ slop - !>([`@ud`ost `@p`q.q.pry `path`(slag p.u.cug pax)]) - (slot 3 vax) - ?^ cam (ap-lame -.q.vax u.cam) - +>.$ - :: - ++ ap-pout :: specific take - |= [pax=path cuf=cuft] - ^+ +> - ?- -.cuf - %coup (ap-punk q.q.pry %coup +.pax `!>(p.cuf)) - %diff (ap-diff q.q.pry pax p.cuf) - %quit (ap-punk q.q.pry %quit +.pax ~) - %reap (ap-punk q.q.pry %reap +.pax `!>(p.cuf)) - == - :: - ++ ap-prep :: install - |= vux=(unit vase) - ^+ +> - =^ gac +>.$ (ap-prop vux) - %= +>.$ - dub - :_(dub ?~(gac [%& dap ?~(vux %boot %bump) now] [%| u.gac])) - == - :: - ++ ap-prop :: install - |= vux=(unit vase) - ^- [(unit tang) _+>] - ?. (ap-fond %prep) - ?~ vux - `+>.$ - ?. (~(nest ut p:(slot 13 hav)) %| p:(slot 13 u.vux)) - :_(+>.$ `(ap-suck "prep mismatch")) - `+>.$(+13.q.hav +13.q.u.vux) - =^ tur +>.$ - %+ ap-call %prep - %+ slop - !>([`@ud`ost `@p`q.q.pry]) - ?~(vux !>(~) (slop !>(~) (slot 13 u.vux))) - ?~(tur `+>.$ :_(+>.$ `u.tur)) - :: - ++ ap-pull :: pull inbound - =+ wim=(~(get by sup.ged) ost) - ?~ wim ~&(%ap-pull-none +) - =: sup.ged (~(del by sup.ged) ost) - pus.ged (~(del ju pus.ged) q.u.wim ost) - qel.ged (~(del by qel.ged) ost) - == - =+ cug=(ap-find %pull q.u.wim) - ?~ cug +> - =^ cam +> - %+ ap-call q.u.cug - !>([[`@ud`ost `@p`q.q.pry] (slag p.u.cug q.u.wim)]) - ?^ cam (ap-lame q.u.cug u.cam) - +>+ - :: - ++ ap-kill :: queue kill - ~& [%ap-kill dap ost] - (ap-give:ap-pull %quit ~) - :: - ++ ap-punk :: non-diff gall take - |= [her=ship cog=term pax=path vux=(unit vase)] - ^+ +> - =+ cug=(ap-find cog pax) - ?~ cug - ~& [%ap-punk-none cog pax] - +>.$ - =^ cam +>.$ - %+ ap-call q.u.cug - =+ den=!>([`@ud`ost `@p`q.q.pry (slag p.u.cug pax)]) - ?~(vux den (slop den u.vux)) - ?^ cam (ap-lame q.u.cug u.cam) - +>.$ - :: - ++ ap-safe :: process move list - |= vax=vase - ^- (each (list cute) tang) - ?~ q.vax [%& ~] - ?@ q.vax [%| (ap-suck "move: malformed list")] - =+ sud=(ap-move (slot 2 vax)) - ?: ?=(%| -.sud) sud - =+ res=$(vax (slot 3 vax)) - ?: ?=(%| -.res) res - [%& p.sud p.res] - :: - ++ ap-sake :: handle result - |= vax=vase - ^- [(unit tang) _+>] - ?: ?=(@ q.vax) - [`(ap-suck "sake: invalid product (atom)") +>.$] - =+ muz=(ap-safe (slot 2 vax)) - ?: ?=(%| -.muz) [`p.muz +>.$] - =+ sav=(ap-save (slot 3 vax)) - ?: ?=(%| -.sav) [`p.sav +>.$] - :- ~ - %_ +>.$ - zip (weld (flop p.muz) zip) - hav p.sav - == - :: - ++ ap-save :: verify core - |= vax=vase - ^- (each vase tang) - ?. (~(nest ut p.hav) %| p.vax) - [%| (ap-suck "invalid core")] - [%& vax] - :: - ++ ap-slam :: virtual slam - |= [cog=term gat=vase arg=vase] - ^- (each vase tang) - =+ wiz=(mule |.((slit p.gat p.arg))) - ?: ?=(%| -.wiz) - ~& %ap-slam-mismatch - ~> %slog.[0 ~(duck ut p.arg)] - ~> %slog.[0 ~(duck ut (~(peek ut p.gat) %free 6))] - [%| (ap-suck "call: {}: type mismatch")] - =+ ton=(mong [q.gat q.arg] ap-sled) - ?- -.ton - %0 [%& p.wiz p.ton] - %1 [%| (turn p.ton |=(a=* (smyt (path a))))] - %2 [%| p.ton] - == - :: - ++ ap-sled (mole (slod ska)) :: namespace view - ++ ap-suck :: standard tang - |= msg=tape - ^- tang - [%leaf (weld "behn: {}: " msg)]~ - :: - ++ ap-term :: atomic vase - |= [a=@tas b=@] - ^- vase - [[%cube b %atom a] b] - :: - ++ ap-vain :: card to vane - |= sep=@tas - ^- (unit ,@tas) - ?+ sep ~& [%ap-vain sep] - ~ - %cash `%a - %conf `%b - %deal `%b - %exec `%f - %flog `%d - %mess `%g - %nuke `%g - %show `%g - %took `%g - %plug `%c - %want `%a - == - -- - -- -++ call :: request - |= [hen=duct hic=(hypo (hobo kiss-behn))] - ^- [p=(list move) q=_..^$] - => .(q.hic ?.(?=(%soft -.q.hic) q.hic ((hard kiss-behn) p.q.hic))) - ?- -.q.hic - %conf - ?. (~(has by pol.all) p.p.q.hic) - ~& [%behn-not-ours p.p.q.hic] - [~ ..^$] - mo-abet:(mo-conf:(mo-abed:mo p.p.q.hic hen) q.p.q.hic q.q.hic) - :: - %deal - =< mo-abet - ?. (~(has by pol.all) q.p.q.hic) :: either to us - ?> (~(has by pol.all) p.p.q.hic) :: or from us - (mo-away:(mo-abed:mo p.p.q.hic hen) q.p.q.hic q.q.hic) - (mo-come:(mo-abed:mo q.p.q.hic hen) p.p.q.hic q.q.hic) - :: - %init - ~& [%behn-init p.q.hic] - [~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))] - :: - %rote - :: ~& [%behn-rote p.q.hic] - ?. (~(has by pol.all) p.p.q.hic) - ~& [%behn-not-ours p.q.hic] - [~ ..^$] - ?> ?=([@ ~] q.q.hic) - =+ dap=i.q.q.hic - =+ our=p.p.q.hic - =+ him=q.p.q.hic - =+ mes=((hard ,[@ud rook]) r.q.hic) - =< mo-abet - (mo-gawk:(mo-abed:mo our hen) him dap mes) - :: - %roth - :: ~& [%behn-roth p.q.hic] - ?. (~(has by pol.all) p.p.q.hic) - ~& [%behn-not-ours p.q.hic] - [~ ..^$] - ?> ?=([@ ~] q.q.hic) - =+ dap=i.q.q.hic - =+ our=p.p.q.hic - =+ him=q.p.q.hic - =+ mes=((hard ,[@ud roon]) r.q.hic) - =< mo-abet - (mo-gawd:(mo-abed:mo our hen) him dap mes) - == -:: -++ doze :: sleep until - |= [now=@da hen=duct] - ^- (unit ,@da) - ~ -:: -++ load :: recreate vane - |= old=axle - ^+ ..^$ - ..^$(all old) -:: -++ scry - |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] - ^- (unit (unit (pair mark ,*))) - [~ ~] -:: -++ stay :: save w/o cache - `axle`all -:: -++ take :: response - |= [tea=wire hen=duct hin=(hypo sign-behn)] - ^- [p=(list move) q=_..^$] - ~| [%behn-take tea] - ?> ?=([@ ?(%sys %use) *] tea) - =+ our=(need (slaw %p i.tea)) - =+ mow=(mo-abed:mo our hen) - ?: ?=(%sys i.t.tea) - mo-abet:(mo-cyst:mow t.t.tea q.hin) - ?> ?=(%use i.t.tea) - mo-abet:(mo-cook:mow t.t.tea hin) --- diff --git a/base/arvo/clay.hoon b/base/arvo/clay.hoon index d954617f4..cb47fc374 100644 --- a/base/arvo/clay.hoon +++ b/base/arvo/clay.hoon @@ -17,30 +17,8 @@ mer=(map (pair ship desk) mery) :: outstanding merges syn=? :: sync to unix == :: -++ gift :: out result <-$ - $% [%ergo p=@p q=@tas r=@ud s=(list ,[path (unit mime)])] - :: version update - [%mass p=mass] :: memory usage - [%mere p=(each (set path) (pair term tang))] :: merge result - [%note p=@tD q=tank] :: debug message - [%writ p=riot] :: response - == :: -++ khan :: - $: fil=(unit (unit cage)) :: XX see khan-to-soba - dir=(map ,@ta khan) :: - == :: -++ kiss :: in request ->$ - $% [%font p=@p q=@tas r=@p s=@tas] :: set upstream - [%info p=@p q=@tas r=nori] :: internal edit - [%init p=@p] :: report install - [%into p=@p q=@tas r=khan] :: external edit - [%lynx p=@p q=@tas r=(unit ,?)] :: sync to unix - [%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks - [%plug p=@p q=@tas r=@p s=@tas] :: unset upstream - [%wart p=sock q=@tas r=path s=*] :: network request - [%warp p=sock q=riff] :: file request - [%wegh ~] :: report memory - == :: +++ gift gift-clay :: out result <-$ +++ kiss kiss-clay :: in request ->$ ++ mery :: $: gem=germ :: strategy cas=case :: ali's case @@ -102,26 +80,6 @@ $: @tas :: by any $% [%crud p=@tas q=(list tank)] :: == == == :: -++ silk :: construction layer - $& [p=silk q=silk] :: cons - $% [%bake p=mark q=beam r=path] :: local synthesis - [%boil p=mark q=beam r=path] :: general synthesis - [%bunt p=mark] :: example of mark - [%call p=silk q=silk] :: slam - [%cast p=mark q=silk] :: translate - [%diff p=silk q=silk] :: diff - [%done p=(set beam) q=gage] :: literal - [%dude p=tank q=silk] :: error wrap - [%dune p=(set beam) q=(unit gage)] :: unit literal - [%join p=mark q=silk r=silk] :: merge - [%mute p=silk q=(list (pair wing silk))] :: mutant - [%pact p=silk q=silk] :: patch - [%reef ~] :: kernel reef - [%ride p=twig q=silk] :: silk thru twig - [%tabl p=(list (pair silk silk))] :: list - [%vale p=mark q=ship r=*] :: validate [our his] - [%volt p=(set beam) q=(cask ,*)] :: unsafe add type - == :: ++ raft :: filesystem $: fat=(map ship room) :: domestic hoy=(map ship rung) :: foreign @@ -138,7 +96,6 @@ mer=(map (pair ship desk) mery) :: outstanding merges syn=? :: sync to unix == :: -++ riff ,[p=desk q=(unit rave)] :: request/desist ++ rind :: request manager $: nix=@ud :: request index bom=(map ,@ud ,[p=duct q=rave]) :: outstanding diff --git a/base/arvo/dill.hoon b/base/arvo/dill.hoon index 5e2d04939..98426399c 100644 --- a/base/arvo/dill.hoon +++ b/base/arvo/dill.hoon @@ -3,59 +3,6 @@ :: |= pit=vase => |% :: interface tiles -++ console-action :: console to app - $% [%det console-change] :: edit prompt line - [%inn ~] :: enter session - [%out ~] :: exit session - [%ret ~] :: submit and clear - == :: -++ console-buffer (list ,@c) :: command state -++ console-change :: network change - $: ler=console-clock :: destination clock - haw=@uvH :: source hash - ted=console-edit :: state change - == :: -++ console-clock ,[own=@ud his=@ud] :: vector clock -++ console-edit :: shared state change - $% [%del p=@ud] :: delete one at - [%ins p=@ud q=@c] :: insert at - [%mor p=(list console-edit)] :: combination - [%nop ~] :: no-op - [%set p=console-buffer] :: discontinuity - == :: -++ console-effect :: app to console - $% [%bel ~] :: beep - [%blk p=@ud q=@c] :: blink/match char at - [%clr ~] :: clear screen - [%det console-change] :: edit input - [%nex ~] :: save and clear input - [%tan p=(list tank)] :: classic tank - :: [%taq p=tanq] :: modern tank - [%txt p=tape] :: text line - == :: -++ dill-belt :: console input - $% [%aro p=?(%d %l %r %u)] :: arrow key - [%bac ~] :: true backspace - [%cru p=@tas q=(list tank)] :: echo error - [%ctl p=@c] :: control-key - [%del ~] :: true delete - [%met p=@c] :: meta-key - [%ret ~] :: return - [%rez p=@ud q=@ud] :: resize, cols, rows - [%txt p=(list ,@c)] :: utf32 text - [%yow p=gill] :: connect to app - == :: -++ dill-blit :: console output - $% [%bel ~] :: make a noise - [%clr ~] :: clear the screen - [%hop p=@ud] :: set cursor position - [%mor p=(list dill-blit)] :: multiple blits - [%pro p=(list ,@c)] :: show as cursor/line - [%qit ~] :: close console - [%out p=(list ,@c)] :: send output line - [%sag p=path q=*] :: save to jamfile - [%sav p=path q=@] :: save to file - == :: ++ gill (pair ship term) :: general contact -- :: => |% :: console protocol @@ -74,41 +21,7 @@ == :: -- => :: |% :: protocol below -++ blew ,[p=@ud q=@ud] :: columns rows -++ belt :: raw console input - $% [%aro p=?(%d %l %r %u)] :: arrow key - [%bac ~] :: true backspace - [%ctl p=@c] :: control-key - [%del ~] :: true delete - [%met p=@c] :: meta-key - [%ret ~] :: return - [%txt p=(list ,@c)] :: utf32 text - == :: -++ blit :: raw console output - $% [%bel ~] :: make a noise - [%clr ~] :: clear the screen - [%hop p=@ud] :: set cursor position - [%lin p=(list ,@c)] :: set current line - [%mor ~] :: newline - [%sag p=path q=*] :: save to jamfile - [%sav p=path q=@] :: save to file - == :: -++ flog :: sent to %dill - $% [%crud p=@tas q=(list tank)] :: - [%text p=tape] :: - [%veer p=@ta q=path r=@t] :: install vane - [%vega p=path] :: reboot by path - [%verb ~] :: verbose mode - == :: -++ gift :: out result <-$ - $% [%bbye ~] :: reset prompt - [%blit p=(list blit)] :: terminal output - [%init p=@p] :: set owner - [%logo ~] :: logout - [%veer p=@ta q=path r=@t] :: install vane - [%vega p=path] :: reboot by path - [%verb ~] :: verbose mode - == :: +++ gift gift-dill :: out result <-$ ++ kiss :: in request ->$ $% [%belt p=belt] :: terminal input [%blew p=blew] :: terminal config @@ -132,19 +45,12 @@ ++ mess :: $% [%dill-belt p=(hypo dill-belt)] :: == :: -++ club :: agent action - $% [%peer p=path] :: subscribe - [%poke p=cage] :: apply - [%pull ~] :: unsubscribe - [%pump ~] :: pump yes/no - == :: ++ cuft :: internal gift $% [%coup p=(unit tang)] :: poke result [%quit ~] :: close subscription [%reap p=(unit tang)] :: peer result [%diff p=cage] :: subscription output == :: -++ cuss (pair term club) :: internal kiss ++ suss (trel term ,@tas ,@da) :: config report ++ move ,[p=duct q=(mold note gift)] :: local move ++ note-ames :: weird ames move @@ -165,7 +71,7 @@ == :: ++ note-gall :: $% [%conf dock %load ship desk] :: - [%deal p=sock q=cuss] :: + [%deal p=sock q=cush] :: == :: ++ note :: out request $-> $% [%a note-ames] :: @@ -419,7 +325,7 @@ =+ ^= flo ^- (list (pair ship term)) =+ myr=(clan p.q.hic) ?: =(%pawn myr) - [[p.q.hic %dojo] ~] + [[p.q.hic %dojo] [p.q.hic %hood] ~] ?: =(%earl myr) =+ fap=(sein p.q.hic) [[fap %dojo] [fap %talk] [fap %hood] ~] diff --git a/base/arvo/eyre.hoon b/base/arvo/eyre.hoon index e6192d7cc..32e824a8c 100644 --- a/base/arvo/eyre.hoon +++ b/base/arvo/eyre.hoon @@ -4,46 +4,8 @@ |= pit=vase => =~ |% :: interfaces -++ club :: agent action - $% [%peer p=path] :: subscribe - [%poke p=cage] :: apply - [%pull ~] :: unsubscribe - [%pump ~] :: subscription ack - == :: -++ cush (pair term club) :: internal kiss -++ cuft :: internal gift - $% [%coup p=(unit tang)] :: poke result - [%diff p=cage] :: subscription output - [%quit ~] :: close subscription - [%reap p=(unit tang)] :: peer result - == :: -++ gift :: out result <-$ - $% [%mass p=mass] :: memory usage - [%thou p=httr] :: raw http response - [%thus p=@ud q=(unit hiss)] :: http request/cancel - [%veer p=@ta q=path r=@t] :: drop-through - [%vega p=path] :: drop-through - == :: -++ gram :: inter-ship message - $? [[%lon ~] p=hole] :: login request - [[%aut ~] p=hole] :: login reply - [[%hat ~] p=hole q=hart] :: login redirect - [[%get ~] p=@uvH q=[? clip httq]] :: remote request - [[%got ~] p=@uvH q=httr] :: remote response - == :: -++ hasp ,[p=ship q=term] :: don't see %gall -++ hapt ,[p=ship q=path] :: do see %gall -++ kiss :: in request ->$ - $% [%born ~] :: new unix process - [%crud p=@tas q=(list tank)] :: XX rethink - [%init p=@p] :: report install - [%them p=(unit hiss)] :: outbound request - [%they p=@ud q=httr] :: inbound response - [%this p=? q=clip r=httq] :: inbound request - [%thud ~] :: inbound cancel - [%wart p=sack q=@tas r=_`[path *]`*gram] :: urbit message - [%wegh ~] :: report memory - == :: +++ gift gift-eyre :: out result <-$ +++ kiss kiss-eyre :: in request ->$ ++ move ,[p=duct q=(mold note gift)] :: local move ++ note :: out request $-> $% $: %a :: to %ames @@ -66,12 +28,6 @@ $% [%wait p=@da] :: [%rest p=@da] :: == == == :: -++ silk :: see %ford - $& [p=silk q=silk] :: - $% [%boil p=mark q=beam r=path] :: - [%cast p=mark q=silk] :: - [%done p=(set beam) q=cage] :: - == :: ++ sign :: in result $<- $? $: %a :: by %ames $% [%went p=ship q=cape] :: @@ -101,7 +57,7 @@ [%on p=span:,@uvH ~] :: dependency [%to p=ixor q=span:ship r=term s=wire] :: associated app == :: -++ whir-of ,[p=span:ship q=term r=wire] :: path in hasp +++ whir-of ,[p=span:ship q=term r=wire] :: path in dock -- :: |% :: models ++ bolo :: eyre state @@ -139,9 +95,9 @@ == ++ honk $%([%nice ~] [%mean p=ares]) :: old gall result ++ even :: client event - $% [%mean p=[hasp path] q=ares] + $% [%mean p=[dock path] q=ares] [%news p=@uv] - [%rush p=[hasp path] q=json] + [%rush p=[dock path] q=json] == :: ++ perk :: parsed request @@ -150,10 +106,10 @@ [%bugs p=?(%as %to) ~] [%beam p=beam] [%deps p=?(%put %delt) q=@uvH] - [%mess p=hasp q=mark r=wire s=json] + [%mess p=dock q=mark r=wire s=json] [%poll p=[i=@uvH t=(list ,@uvH)]] [%spur p=spur] - [%subs p=?(%put %delt) q=[hasp %json wire path]] + [%subs p=?(%put %delt) q=[dock %json wire path]] [%view p=ixor q=[~ u=@ud]] == :: @@ -197,7 +153,7 @@ [[%$ %t p.i.quy] [%$ %t q.i.quy] $(quy t.quy)] == :: -++ gsig |=([a=hasp b=path] [(scot %p p.a) q.a b]) +++ gsig |=([a=dock b=path] [(scot %p p.a) q.a b]) ++ session-from-cookies |= [nam=@t maf=math] ^- (unit hole) @@ -1156,7 +1112,7 @@ ++ teba |*(a=$+(* ..ix) |*(b=* %_(done ..ix (a b)))) ++ give-json (teba ^give-json) ++ hurl-note - |= [a=[hasp path] b=note] ^+ ..ix + |= [a=[dock path] b=note] ^+ ..ix =: med (~(put to med) hen) hen `~ == @@ -1168,15 +1124,15 @@ [+(p.eve) (~(put by q.eve) p.eve a)] :: ++ new-mess - |= [a=hasp b=wire c=cage] ^+ ..ix + |= [a=dock b=wire c=cage] ^+ ..ix (hurl-note [a b] [%g %deal [him -.a] +.a %poke c]) :: ++ add-subs - |= [a=hasp %json b=wire c=path] ^+ ..ix + |= [a=dock %json b=wire c=path] ^+ ..ix (hurl-note [a b] [%g %deal [him -.a] +.a %peer c]) :: ++ del-subs :: XX per path? - |= [a=hasp %json b=wire c=path] ^+ ..ix + |= [a=dock %json b=wire c=path] ^+ ..ix (hurl-note [a b] [%g %deal [him -.a] +.a %pull ~]) :: ++ get-rush @@ -1221,7 +1177,7 @@ == :: ++ pass-took - |= a=[p=hasp wire] + |= a=[p=dock wire] %+ pass-note(hen `~) [%of ire (gsig a)] [%g %deal [him -.p.a] +.p.a %pump ~] @@ -1238,7 +1194,7 @@ abet:(give-even & a ven) :: ++ subs-to-json - |= [a=hasp b=path] + |= [a=dock b=path] %- jobe :~ ship/[%s (rsh 3 1 (scot %p p.a))] appl/[%s q.a] @@ -1246,7 +1202,7 @@ == ++ wake ^+(..ix abet(ude ~)) :: XX other effects? :: XX unused - ++ print-subs |=([a=hasp b=path] "{}/{(trip q.a)}{(spud b)}") + ++ print-subs |=([a=dock b=path] "{}/{(trip q.a)}{(spud b)}") -- -- -- . == diff --git a/base/arvo/ford.hoon b/base/arvo/ford.hoon index 1927d432d..f1c4a696c 100644 --- a/base/arvo/ford.hoon +++ b/base/arvo/ford.hoon @@ -7,87 +7,18 @@ :: structures |% :: -++ bead ,[p=(set beam) q=gage] :: computed result -++ gift :: out result <-$ - $% [%made p=@uvH q=(each gage tang)] :: computed result - [%mass p=mass] :: memory usage - [%news ~] :: fresh depends - == :: +++ gift gift-ford :: out result <-$ ++ heel path :: functional ending -++ hock :: standard label - $: [%c p=@ud] :: celsius version - [%k p=@ud] :: kelvin version - [%s p=@ud q=@ud r=@ud] :: semantic version - == :: -++ hood :: assembly plan - $: zus=@ud :: zuse kelvin - sur=(list hoot) :: structures - lib=(list hoof) :: libraries - fan=(list horn) :: resources - src=(list hoop) :: program - == :: -++ hoof (pair term (unit (pair case ship))) :: resource reference -++ hoot (pair bean hoof) :: structure gate/core -++ hoop :: source in hood - $% [%& p=twig] :: direct twig - [%| p=beam] :: resource location - == :: -++ horn :: resource tree - $% [%ape p=twig] :: /~ twig by hand - [%arg p=twig] :: /$ argument - [%day p=horn] :: /| list by @dr - [%dub p=term q=horn] :: /= apply face - [%fan p=(list horn)] :: /. list - [%for p=path q=horn] :: /, descend - [%hel p=@ud q=horn] :: /% propagate heel - [%hub p=horn] :: /@ list by @ud - [%man p=(map span horn)] :: /* hetero map - [%nap p=horn] :: /_ homo map - [%now p=horn] :: /& list by @da - [%saw p=twig q=horn] :: /; operate on - [%see p=beam q=horn] :: /: relative to - [%sic p=tile q=horn] :: /^ cast - [%toy p=mark] :: /mark/ static - == :: -++ kiss :: in request ->$ - $% [%exec p=@p q=beak r=(unit silk)] :: make / kill - [%wasp p=@p q=@uvH] :: depends query - [%wegh ~] :: report memory - == :: -++ milk (trel ship desk silk) :: sourced silk +++ kiss kiss-ford :: in request ->$ ++ move ,[p=duct q=(mold note gift)] :: local move ++ note :: out request $-> $% $: %c :: to %clay $% [%warp p=sock q=riff] :: == == == :: -++ riff ,[p=desk q=(unit rave)] :: see %clay ++ sign :: in result $<- $% $: %c :: by %clay $% [%writ p=riot] :: == == == :: -++ silk :: construction layer - $& [p=silk q=silk] :: cons - $% [%bake p=mark q=beam r=path] :: local synthesis - [%boil p=mark q=beam r=path] :: general synthesis - [%bunt p=mark] :: example of mark - [%call p=silk q=silk] :: slam - [%cast p=mark q=silk] :: translate - [%diff p=silk q=silk] :: diff - [%done p=(set beam) q=gage] :: literal - [%dude p=tank q=silk] :: error wrap - [%dune p=(set beam) q=(unit gage)] :: unit literal - [%file p=beam] :: from clay - [%join p=mark q=silk r=silk] :: merge - [%mash p=mark q=milk r=milk] :: annotate - [%mute p=silk q=(list (pair wing silk))] :: mutant - [%pact p=silk q=silk] :: patch - [%plan p=beam q=spur r=hood] :: structured assembly - [%reef ~] :: kernel reef - [%ride p=twig q=silk] :: silk thru twig - [%tabl p=(list (pair silk silk))] :: list - [%vale p=mark q=ship r=*] :: validate [our his] - [%volt p=(set beam) q=(cask ,*)] :: unsafe add type - == :: -- :: |% :: structures ++ axle :: all %ford state diff --git a/base/arvo/gall.hoon b/base/arvo/gall.hoon index 9bc515310..50fae426f 100644 --- a/base/arvo/gall.hoon +++ b/base/arvo/gall.hoon @@ -5,60 +5,6 @@ => =~ |% :::::::::::::::::::::::::::::::::::::::::::::::::::::: rest of arvo :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ hood :: assembly plan - $: zus=@ud :: zuse kelvin - sur=(list hoot) :: structures - lib=(list hoof) :: libraries - fan=(list horn) :: resources - src=(list hoop) :: program - == :: -++ hoof (pair term (unit (pair case ship))) :: resource reference -++ hoot (pair bean hoof) :: structure gate/core -++ hoop :: source in hood - $% [%& p=twig] :: direct twig - [%| p=beam] :: resource location - == :: -++ horn :: resource tree - $% [%ape p=twig] :: /~ twig by hand - [%arg p=twig] :: /$ argument - [%day p=horn] :: /| list by @dr - [%dub p=term q=horn] :: /= apply face - [%fan p=(list horn)] :: /. list - [%for p=path q=horn] :: /, descend - [%hel p=@ud q=horn] :: /% propagate heel - [%hub p=horn] :: /@ list by @ud - [%man p=(map span horn)] :: /* hetero map - [%nap p=horn] :: /_ homo map - [%now p=horn] :: /& list by @da - [%saw p=twig q=horn] :: /; operate on - [%see p=beam q=horn] :: /: relative to - [%sic p=tile q=horn] :: /^ cast - [%toy p=mark] :: /mark/ static - == :: -++ milk (trel ship desk silk) :: sourced silk -++ silk :: construction layer - $& [p=silk q=silk] :: cons - $% [%bake p=mark q=beam r=path] :: local synthesis - [%boil p=mark q=beam r=path] :: general synthesis - [%bunt p=mark] :: example of mark - [%call p=silk q=silk] :: slam - [%cast p=mark q=silk] :: translate - [%diff p=silk q=silk] :: diff - [%done p=(set beam) q=gage] :: literal - [%dude p=tank q=silk] :: error wrap - [%dune p=(set beam) q=(unit gage)] :: unit literal - [%file p=beam] :: from clay - [%join p=mark q=silk r=silk] :: merge - [%mash p=mark q=milk r=milk] :: annotate - [%mute p=silk q=(list (pair wing silk))] :: mutant - [%pact p=silk q=silk] :: patch - [%plan p=beam q=spur r=hood] :: structured assembly - [%reef ~] :: kernel reef - [%ride p=twig q=silk] :: silk thru twig - [%tabl p=(list (pair silk silk))] :: list - [%vale p=mark q=ship r=*] :: validate [our his] - [%volt p=(set beam) q=(cask ,*)] :: unsafe add type - == :: ++ volt ?(%low %high) :: voltage ++ torc $|(?(%iron %gold) [%lead p=ship]) :: security control ++ roon :: reverse ames msg @@ -73,76 +19,13 @@ -- :: |% :::::::::::::::::::::::::::::::::::::::::::::::::::::: local arvo :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ club :: agent action - $% [%peer p=path] :: subscribe - [%poke p=cage] :: apply - [%pull ~] :: unsubscribe - [%pump ~] :: subscription ack - == :: -++ culm :: config action - $% [%load p=scup] :: load/reload - :: [%kick ~] :: restart everything - :: [%stop ~] :: toggle suspend - :: [%wipe ~] :: destroy all state - == :: -++ cuss (pair dude club) :: internal kiss -++ cuft :: internal gift - $% [%coup p=(unit tang)] :: poke result - [%diff p=cage] :: subscription output - [%quit ~] :: close subscription - [%reap p=(unit tang)] :: peer result - == :: ++ cote :: ++ap note $% [%meta p=@tas q=vase] :: - [%send p=ship q=cuss] :: + [%send p=ship q=cush] :: == :: ++ cove (pair duct (mold cote cuft)) :: internal move ++ cute (pair bone (mold cote cuft)) :: internal move -++ dude term :: local identity -++ scup (pair ship desk) :: autoupdate -++ suss (trel dude ,@tas ,@da) :: config report -++ tang (list tank) :: error abstraction --- :: -|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: %gall cards - :::::::::::::::::::::::::::::::::::::::::::::::::::::: -++ kiss-ames :: - $% [%wont p=sock q=path r=*] :: - == :: -++ kiss-gall :: incoming request - $% [%conf p=dock q=culm] :: configure app - [%init p=ship] :: set owner - [%deal p=sock q=cuss] :: full transmission - [%rote p=sack q=path r=*] :: remote request - [%roth p=sack q=path r=*] :: remote response - == :: -++ kiss-ford :: - $% [%exec p=@p q=beak r=(unit silk)] :: make / kill - [%wasp p=@p q=@uvH] :: depends query - == :: -++ gift-ames :: - $% [%woot p=ship q=(unit ares)] :: e2e reaction message - == :: -++ gift-gall :: outgoing result - $% [%onto p=(each suss tang)] :: about agent - [%unto p=cuft] :: within agent - [%mack p=(unit tang)] :: message ack - == :: -++ gift-ford :: out result <-$ - $% [%made p=@uvH q=(each gage tang)] :: computed result - [%news ~] :: fresh depends - == :: -++ sign-gall :: incoming result - $% [%a gift-ames] :: - [%f gift-ford] :: - [%g gift-gall] :: - == :: -++ note-gall :: outgoing request - $? [@tas %meta p=vase] :: - $% [%a kiss-ames] :: - [%f kiss-ford] :: - [%g kiss-gall] :: - == == :: -++ move ,[p=duct q=(mold note-gall gift-gall)] :: typed move +++ move ,[p=duct q=(mold note-arvo gift-arvo)] :: typed move -- :: |% :::::::::::::::::::::::::::::::::::::::::::::::::::::: %gall state :::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -235,7 +118,7 @@ (mo-boot dap ?:((~(has by bum) dap) %old %new) p.lum) :: ++ mo-pass :: standard pass - |= [pax=path noh=note-gall] + |= [pax=path noh=note-arvo] %_(+> moz :_(moz [hen %pass pax noh])) :: ++ mo-give @@ -308,11 +191,11 @@ :: ~& [%mo-boot dap how pup] %+ mo-pass [%sys how dap (scot %p p.pup) q.pup ~] =+ bek=[p.pup q.pup [%da now]] - ^- note-gall + ^- note-arvo [%f %exec our bek `[%boil %core [bek [dap %ape ~]] ~]] :: ++ mo-away :: foreign request - |= [him=ship caz=cuss] :: + |= [him=ship caz=cush] :: ^+ +> :: ~& [%mo-away him caz] ?: ?=(%pump -.q.caz) @@ -333,7 +216,7 @@ == %+ mo-pass [%sys %way -.q.caz ~] - `note-gall`[%a %wont [our him] [%q %ge p.caz ~] [num roc]] + `note-arvo`[%a %wont [our him] [%q %ge p.caz ~] [num roc]] :: ++ mo-baal :: error convert a |= art=(unit ares) @@ -381,7 +264,7 @@ (~(got by r:(~(got by sap) him)) num) :: ++ mo-come :: handle locally - |= [her=ship caz=cuss] + |= [her=ship caz=cush] ^+ +> =+ pry=`prey`[%high [~ her]] (mo-club p.caz pry q.caz) @@ -393,7 +276,7 @@ [~ `tang`[[%leaf (trip p.u.cup)] q.u.cup]] :: ++ mo-cyst :: take in /sys - |= [pax=path sih=sign-gall] + |= [pax=path sih=sign-arvo] ^+ +> ?+ -.pax !! %dep :: update @@ -478,7 +361,7 @@ == :: ++ mo-cook :: take in /use - |= [pax=path hin=(hypo sign-gall)] + |= [pax=path hin=(hypo sign-arvo)] ^+ +> ?. ?=([@ @ ?(%inn %out) *] pax) ~& [%mo-cook-bad-pax pax] @@ -530,7 +413,7 @@ |= [him=@p dap=dude num=@ud rok=rook] %+ mo-pass [%sys %req (scot %p him) dap (scot %ud num) ~] - ^- note-gall + ^- note-arvo ?- -.rok %m [%f %exec our (mo-beak dap) ~ %vale p.rok our q.rok] %s [%g %deal [him our] dap %peer p.rok] @@ -611,8 +494,8 @@ %pass :+ %pass `path`[%use dap p.q.cov] ?- -.q.q.cov - %send `note-gall`[%g %deal [our p.q.q.cov] q.q.q.cov] - %meta `note-gall`[`@tas`p.q.q.cov %meta `vase`q.q.q.cov] + %send `note-arvo`[%g %deal [our p.q.q.cov] q.q.q.cov] + %meta `note-arvo`[`@tas`p.q.q.cov %meta `vase`q.q.q.cov] == == :: @@ -762,6 +645,7 @@ :: ++ ap-move-diff :: give diff move |= [sto=bone vax=vase] + =. vax (spec vax) ^- (each cute tang) ?. &(?=(^ q.vax) ?=(@ -.q.vax) ((sane %tas) -.q.vax)) [%| (ap-suck "move: improper diff")] @@ -1077,6 +961,7 @@ %lynx `%c %merg `%c %plug `%c + %them `%e %want `%a == -- @@ -1104,7 +989,7 @@ [~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))] :: %rote - :: ~& [%gall-rote p.q.hic] + ~& [%gall-rote p.q.hic] ?. (~(has by pol.all) p.p.q.hic) ~& [%gall-not-ours p.q.hic] [~ ..^$] @@ -1149,7 +1034,7 @@ `axle`all :: ++ take :: response - |= [tea=wire hen=duct hin=(hypo sign-gall)] + |= [tea=wire hen=duct hin=(hypo sign-arvo)] ^- [p=(list move) q=_..^$] ~| [%gall-take tea] ?> ?=([@ ?(%sys %use) *] tea) diff --git a/base/arvo/hoon.hoon b/base/arvo/hoon.hoon index 05997f616..910b46f23 100644 --- a/base/arvo/hoon.hoon +++ b/base/arvo/hoon.hoon @@ -9634,7 +9634,6 @@ a :: == :: ++ kirk (unit (set monk)) :: audience -++ khan ,[p=@tas q=@ta] :: foreign identity ++ lens :: observation core $_ ^? :: |% ++ u *(unit (unit ,~)) :: existence @@ -9652,7 +9651,7 @@ ++ mass (each noun (list (pair cord ,mass))) :: memory usage ++ mill (each vase milt) :: vase/metavase ++ milt ,[p=* q=*] :: metavase -++ monk (each ship khan) :: general identity +++ monk (each ship ,[p=@tas q=@ta]) :: general identity ++ mold :: new kernel action |* [a=$+(* *) b=$+(* *)] :: forward/reverse $% [%pass p=path q=a] :: advance diff --git a/base/arvo/time.hoon b/base/arvo/time.hoon index b9aa9e8f0..040cb9c9c 100644 --- a/base/arvo/time.hoon +++ b/base/arvo/time.hoon @@ -12,12 +12,7 @@ == :: ++ broq |* [a=_,* b=_,*] :: brodal skew qeu (list (sqeu a b)) :: -++ weight - (each noun (list (pair tape weight))) -++ gift :: out result <-$ - $% [%mass p=mass] :: memory usage - [%wake ~] :: wakey-wakey - == :: +++ gift gift-time :: out result <-$ ++ kiss :: in request ->$ $% [%rest p=@da] :: cancel alarm [%wait p=@da] :: set alarm diff --git a/base/arvo/zuse.hoon b/base/arvo/zuse.hoon index 8c8140cec..f8fadd68c 100644 --- a/base/arvo/zuse.hoon +++ b/base/arvo/zuse.hoon @@ -1887,7 +1887,7 @@ wab=(map ship bath) :: relationship == :: ++ cred :: credential - $: hut=hoot :: client host + $: hut=hart :: client host aut=(jug ,@tas ,@t) :: client identities orx=oryx :: CSRF secret acl=(unit ,@t) :: accept-language @@ -2001,7 +2001,6 @@ ++ hiss ,[p=purl q=moth] :: outbound request ++ hist ,[p=@ud q=(list ,@t)] :: depth texts ++ hole ,@t :: session identity -++ hoot ,[p=? q=(unit ,@ud) r=host] :: secure/port/host ++ hort ,[p=(unit ,@ud) q=host] :: http port/host ++ host $%([& p=(list ,@t)] [| p=@if]) :: http host ++ hoke %+ each ,[%localhost ~] :: local host @@ -2264,23 +2263,329 @@ ++ will (list deed) :: certificate ++ zuse %310 :: hoon/zuse kelvin :: :: -:::: :::: this will become `%york`, separating out structures - :: :: related to arvo in - - - - - - - - - - - - - - - - - +:::: :::: this will become `%york`, vane structures. + :: :: +++ gift-ames :: out result <-$ + $% [%hear p=lane q=@] :: receive packet + [%init p=@p] :: report install + [%mass p=mass] :: memory usage + [%send p=lane q=@] :: transmit packet + [%waft p=sock q=*] :: response message + [%wart p=sock q=@tas r=path s=*] :: network request + [%went p=ship q=cape] :: reaction message + [%woot p=ship q=coop] :: e2e reaction message + == :: +++ kiss-ames :: in request ->$ + $% [%barn ~] :: new unix process + [%crud p=@tas q=(list tank)] :: error with trace + [%cash p=@p q=buck] :: civil license + [%hear p=lane q=@] :: receive packet + [%hole p=lane q=@] :: packet failed + [%junk p=@] :: entropy + [%kick p=@da] :: wake up + [%make p=(unit ,@t) q=@ud r=@ s=?] :: wild license + [%sith p=@p q=@uw r=?] :: imperial generator + [%wake ~] :: timer activate + [%want p=sock q=path r=*] :: send message + [%wegh ~] :: report memory + [%wont p=sock q=path r=*] :: e2e send message + == :: +:: +:::: %clay + :: +++ khan :: + $: fil=(unit (unit cage)) :: XX see khan-to-soba + dir=(map ,@ta khan) :: + == :: +++ mick (list ,[path (unit mime)]) +++ riff ,[p=desk q=(unit rave)] :: request/desist +:::: :: +++ gift-clay :: out result <-$ + $% [%ergo p=@p q=@tas r=@ud s=mick] :: version update + [%mass p=mass] :: memory usage + [%mere p=(each (set path) (pair term tang))] :: merge result + [%note p=@tD q=tank] :: debug message + [%writ p=riot] :: response + == :: +++ kiss-clay :: in request ->$ + $% [%font p=@p q=@tas r=@p s=@tas] :: set upstream + [%info p=@p q=@tas r=nori] :: internal edit + [%init p=@p] :: report install + [%into p=@p q=@tas r=khan] :: external edit + [%lynx p=@p q=@tas r=(unit ,?)] :: sync to unix + [%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks + [%plug p=@p q=@tas r=@p s=@tas] :: unset upstream + [%wart p=sock q=@tas r=path s=*] :: network request + [%warp p=sock q=riff] :: file request + [%wegh ~] :: report memory + == :: +:: +:::: + :: +++ blew ,[p=@ud q=@ud] :: columns rows +++ belt :: old belt + $% [%aro p=?(%d %l %r %u)] :: arrow key + [%bac ~] :: true backspace + [%ctl p=@c] :: control-key + [%del ~] :: true delete + [%met p=@c] :: meta-key + [%ret ~] :: return + [%txt p=(list ,@c)] :: utf32 text + == :: +++ blit :: old blit + $% [%bel ~] :: make a noise + [%clr ~] :: clear the screen + [%hop p=@ud] :: set cursor position + [%lin p=(list ,@c)] :: set current line + [%mor ~] :: newline + [%sag p=path q=*] :: save to jamfile + [%sav p=path q=@] :: save to file + == :: +++ dill-belt :: new belt + $% [%aro p=?(%d %l %r %u)] :: arrow key + [%bac ~] :: true backspace + [%cru p=@tas q=(list tank)] :: echo error + [%ctl p=@] :: control-key + [%del ~] :: true delete + [%met p=@] :: meta-key + [%ret ~] :: return + [%rez p=@ud q=@ud] :: resize, cols, rows + [%txt p=(list ,@c)] :: utf32 text + [%yow p=gill] :: connect to app + == :: +++ dill-blit :: new blit + $% [%bel ~] :: make a noise + [%clr ~] :: clear the screen + [%hop p=@ud] :: set cursor position + [%mor p=(list dill-blit)] :: multiple blits + [%pro p=(list ,@c)] :: show as cursor/line + [%qit ~] :: close console + [%out p=(list ,@c)] :: send output line + [%sag p=path q=*] :: save to jamfile + [%sav p=path q=@] :: save to file + == :: +++ flog :: sent to %dill + $% [%crud p=@tas q=(list tank)] :: + [%text p=tape] :: + [%veer p=@ta q=path r=@t] :: install vane + [%vega p=path] :: reboot by path + [%verb ~] :: verbose mode + == :: +++ gill (pair ship term) :: general contact +:::: +++ gift-dill :: out result <-$ + $% [%bbye ~] :: reset prompt + [%blit p=(list blit)] :: terminal output + [%init p=@p] :: set owner + [%logo ~] :: logout + [%veer p=@ta q=path r=@t] :: install vane + [%vega p=path] :: reboot by path + [%verb ~] :: verbose mode + == :: +++ kiss-dill :: in request ->$ + $% [%belt p=belt] :: terminal input + [%blew p=blew] :: terminal config + [%boot p=*] :: weird %dill boot + [%crud p=@tas q=(list tank)] :: error with trace + [%flog p=flog] :: wrapped error + [%flow p=@tas q=(list gill)] :: terminal config + [%hail ~] :: terminal refresh + [%hook ~] :: this term hung up + [%harm ~] :: all terms hung up + [%init p=ship] :: after gall ready + [%noop ~] :: no operation + [%talk p=tank] :: + [%text p=tape] :: + [%veer p=@ta q=path r=@t] :: install vane + [%vega p=path] :: reboot by path + [%verb ~] :: verbose mode + == :: +:: +:::: %eyre + :: +++ gram :: inter-ship message + $? [[%lon ~] p=hole] :: login request + [[%aut ~] p=hole] :: login reply + [[%hat ~] p=hole q=hart] :: login redirect + [[%get ~] p=@uvH q=[? clip httq]] :: remote request + [[%got ~] p=@uvH q=httr] :: remote response + == :: +:::: :: +++ kiss-eyre :: in request ->$ + $% [%born ~] :: new unix process + [%crud p=@tas q=(list tank)] :: XX rethink + [%init p=@p] :: report install + [%them p=(unit hiss)] :: outbound request + [%they p=@ud q=httr] :: inbound response + [%this p=? q=clip r=httq] :: inbound request + [%thud ~] :: inbound cancel + [%wart p=sack q=@tas r=_`[path *]`*gram] :: urbit message + [%wegh ~] :: report memory + == :: +++ gift-eyre :: out result <-$ + $% [%mass p=mass] :: memory usage + [%thou p=httr] :: raw http response + [%thus p=@ud q=(unit hiss)] :: http request/cancel + [%veer p=@ta q=path r=@t] :: drop-through + [%vega p=path] :: drop-through + == :: +:: +:::: %ford + :: +++ hood :: assembly plan + $: zus=@ud :: zuse kelvin + sur=(list hoot) :: structures + lib=(list hoof) :: libraries + fan=(list horn) :: resources + src=(list hoop) :: program + == :: +++ hoof (pair term (unit (pair case ship))) :: resource reference +++ hoot (pair bean hoof) :: structure gate/core +++ hoop :: source in hood + $% [%& p=twig] :: direct twig + [%| p=beam] :: resource location + == :: +++ horn :: resource tree + $% [%ape p=twig] :: /~ twig by hand + [%arg p=twig] :: /$ argument + [%day p=horn] :: /| list by @dr + [%dub p=term q=horn] :: /= apply face + [%fan p=(list horn)] :: /. list + [%for p=path q=horn] :: /, descend + [%hel p=@ud q=horn] :: /% propagate heel + [%hub p=horn] :: /@ list by @ud + [%man p=(map span horn)] :: /* hetero map + [%nap p=horn] :: /_ homo map + [%now p=horn] :: /& list by @da + [%saw p=twig q=horn] :: /; operate on + [%see p=beam q=horn] :: /: relative to + [%sic p=tile q=horn] :: /^ cast + [%toy p=mark] :: /mark/ static + == :: +++ milk (trel ship desk silk) :: sourced silk +++ silk :: construction layer + $& [p=silk q=silk] :: cons + $% [%bake p=mark q=beam r=path] :: local synthesis + [%boil p=mark q=beam r=path] :: general synthesis + [%bunt p=mark] :: example of mark + [%call p=silk q=silk] :: slam + [%cast p=mark q=silk] :: translate + [%diff p=silk q=silk] :: diff + [%done p=(set beam) q=gage] :: literal + [%dude p=tank q=silk] :: error wrap + [%dune p=(set beam) q=(unit gage)] :: unit literal + [%file p=beam] :: from clay + [%join p=mark q=silk r=silk] :: merge + [%mash p=mark q=milk r=milk] :: annotate + [%mute p=silk q=(list (pair wing silk))] :: mutant + [%pact p=silk q=silk] :: patch + [%plan p=beam q=spur r=hood] :: structured assembly + [%reef ~] :: kernel reef + [%ride p=twig q=silk] :: silk thru twig + [%tabl p=(list (pair silk silk))] :: list + [%vale p=mark q=ship r=*] :: validate [our his] + [%volt p=(set beam) q=(cask ,*)] :: unsafe add type + == :: +:::: +++ gift-ford :: out result <-$ + $% [%made p=@uvH q=(each gage tang)] :: computed result + [%mass p=mass] :: memory usage + [%news ~] :: fresh depends + == :: +++ kiss-ford :: in request ->$ + $% [%exec p=@p q=beak r=(unit silk)] :: make / kill + [%wasp p=@p q=@uvH] :: depends query + [%wegh ~] :: report memory + == :: +:: +:::: %gall + :: +++ club :: agent action + $% [%peer p=path] :: subscribe + [%poke p=cage] :: apply + [%pull ~] :: unsubscribe + [%pump ~] :: pump yes/no + == :: +++ cuft :: internal gift + $% [%coup p=(unit tang)] :: poke result + [%diff p=cage] :: subscription output + [%quit ~] :: close subscription + [%reap p=(unit tang)] :: peer result + == :: +++ culm :: config action + $% [%load p=scup] :: load/reload + :: [%kick ~] :: restart everything + :: [%stop ~] :: toggle suspend + :: [%wipe ~] :: destroy all state + == :: +++ cush (pair term club) :: internal kiss +++ dude term :: server identity +++ scup (pair ship desk) :: autoupdate +++ suss (trel dude ,@tas ,@da) :: config report +:::: :: +++ kiss-gall :: incoming request + $% [%conf p=dock q=culm] :: configure app + [%init p=ship] :: set owner + [%deal p=sock q=cush] :: full transmission + [%rote p=sack q=path r=*] :: remote request + [%roth p=sack q=path r=*] :: remote response + == :: +++ gift-gall :: outgoing result + $% [%onto p=(each suss tang)] :: about agent + [%unto p=cuft] :: within agent + [%mack p=(unit tang)] :: message ack + == :: +:: +:::: %time + :: +++ gift-time :: out result <-$ + $% [%mass p=mass] :: memory usage + [%wake ~] :: wakey-wakey + == :: +++ kiss-time :: in request ->$ + $% [%rest p=@da] :: cancel alarm + [%wait p=@da] :: set alarm + [%wake ~] :: timer activate + [%wegh ~] :: report memory + == :: +:: +:::: %arvo + :: +++ gift-arvo :: out result <-$ + $? gift-ames + gift-clay + gift-dill + gift-eyre + gift-ford + gift-gall + gift-time + == +++ kiss-arvo :: in request ->$ + $? kiss-ames + kiss-clay + kiss-dill + kiss-eyre + kiss-ford + kiss-gall + kiss-time + == +++ note-arvo :: out request $-> + $? [@tas %meta vase] + $% [%a kiss-ames] + [%c kiss-clay] + [%d kiss-dill] + [%e kiss-eyre] + [%f kiss-ford] + [%g kiss-gall] + [%t kiss-time] + == == +++ sign-arvo :: in result $<- + $% [%a gift-ames] + [%c gift-clay] + [%d gift-dill] + [%e gift-eyre] + [%f gift-ford] + [%g gift-gall] + [%t gift-time] + == -- diff --git a/base/lib/helm/core.hook b/base/lib/helm/core.hook index 3bae59840..bab89d6d2 100644 --- a/base/lib/helm/core.hook +++ b/base/lib/helm/core.hook @@ -45,24 +45,15 @@ |% :: helm library ++ helm-work :: work in helm |= [[hide from] helm-part] - ?> =(src our) =+ sez=(fall (~(get by hoc) ost) *helm-session) => |% :: arvo structures ++ card :: $% [%cash wire p=@p q=buck] :: [%conf wire dock %load ship term] :: - [%flog wire dill] :: + [%flog wire flog] :: [%plug wire @p @tas @p @tas] :: [%want wire sock path *] :: send message == :: - ++ suss ,[term @tas @da] :: config report - ++ dill :: sent to %dill - $% [%crud p=term q=(list tank)] :: fat report - [%text p=tape] :: thin report - [%veer p=@ta q=path r=@t] :: install vane - [%vega p=path] :: reboot by path - [%verb ~] :: verbose mode - == :: ++ move (pair bone card) :: user-level move -- |_ moz=(list move) @@ -81,7 +72,7 @@ =+ buz=(shax :(mix (jam ges) eny)) =+ loy=(bruw 2.048 buz) %- emit(bur `[his [0 sec:ex:loy]~]) - [%want /ticketing [our (sein his)] /q/ta his tic ges pub:ex:loy] + [%want /helm/ticket [our (sein his)] /q/ta his tic ges pub:ex:loy] :: ++ poke-init :: initialize |= him=ship =< abet @@ -135,26 +126,31 @@ [%flog /reset %veer p way txt] :: ++ poke-will :: hear certificate - |= wil=(unit will) =< abet + |= wil=(unit will) ?> ?=(^ bur) - ?> ?=(^ wil) + ?> ?=(^ wil) + =< abet %- emil(bur ~) + ~& [%poke-will wil] :~ [%cash /helm p.u.bur q.u.bur u.wil] - [%plug /helm our %main (sein our) %main] - [%plug /helm our %arvo (sein our) %arvo] - [%plug /helm our %try (sein our) %try] + [%plug /helm our %home (sein our) %kids] == :: - ++ poke-verb + ++ poke-verb :: toggle verbose |= ~ =< abet (emit %flog /helm %verb ~) :: ++ take-onto :: result of %conf |= saw=(each suss tang) =< abet + ~& [%take-onto saw] %- emit ?- -.saw %| [%flog ~ %crud %onto `tang`p.saw] %& [%flog ~ %text "<{}>"] == + :: + ++ take-went :: result of %want + |= [way=path her=ship kay=cape] =< abet + (emit %flog ~ %text "went: {<[way kay]>}") -- -- diff --git a/base/lib/kiln/core.hook b/base/lib/kiln/core.hook index ccbc2f539..8caa456d6 100644 --- a/base/lib/kiln/core.hook +++ b/base/lib/kiln/core.hook @@ -42,7 +42,7 @@ :: :: :: :::: :: :: !: :: :: -|% :: helm library +|% :: kiln library ++ kiln-work :: work in kiln |= [[hide from] kiln-part] ?> =(src our) @@ -296,7 +296,7 @@ :~ :~ leaf/"" leaf/"done setting up scratch space in %{-}" leaf/"please resolve the following conflicts and run" - leaf/":helm+merge %{(trip syd)} {} %{-}" + leaf/":+merge %{(trip syd)} {} %{-}" == ?~ annotated ~ diff --git a/base/pub/octo/fab/hymn.hook b/base/pub/octo/fab/hymn.hook new file mode 100644 index 000000000..bf7ba4d94 --- /dev/null +++ b/base/pub/octo/fab/hymn.hook @@ -0,0 +1,19 @@ +:: +:: +:::: /hook/hymn/fab/octo/pub/ + :: +^- manx +;html + ;head + ;meta(charset "utf-8"); + ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.js"); + ;script(type "text/javascript", src "/~~/~/at/base/lib/urb.js"); + ;link(type "text/css", rel "stylesheet", href "/home/pub/octo/src/main.css"); + ;title: urbit cit cat eot + == + ;body + ;div#bord; + ;div#whom; + ;script(type "text/javascript", src "/home/pub/octo/src/main.js"); + == +== diff --git a/base/pub/octo/src/main.css b/base/pub/octo/src/main.css new file mode 100644 index 000000000..839f686b7 --- /dev/null +++ b/base/pub/octo/src/main.css @@ -0,0 +1,54 @@ +#bord, +#whom { + width: 600px; + text-align: center; + position: absolute; + left: 50%; + margin-left: -300px; +} + +#bord { + width: 600px; + height: 600px; + position: absolute; + top: 18px; +} + +#whom, +.spac { + font-size: 100px; + line-height: 200px; +} + +.spac { + width: 198px; + height: 198px; + border: 1px solid #000; + text-align: center; + float: left; + cursor: pointer; +} + +.spac[data-index="0-0"], +.spac[data-index="1-0"], +.spac[data-index="2-0"] { + border-top: 0; +} + +.spac[data-index="0-0"], +.spac[data-index="0-1"], +.spac[data-index="0-2"] { + border-left: 0; +} + +.spac[data-index="2-0"], +.spac[data-index="2-1"], +.spac[data-index="2-2"] { + border-right: 0; +} + +.spac[data-index="0-2"], +.spac[data-index="1-2"], +.spac[data-index="2-2"] { + border-bottom: 0; +} \ No newline at end of file diff --git a/base/pub/octo/src/main.js b/base/pub/octo/src/main.js new file mode 100644 index 000000000..b96a5a139 --- /dev/null +++ b/base/pub/octo/src/main.js @@ -0,0 +1,44 @@ +$(function() { + $bord = $('#bord') + $whom = $('#whom') + + symb = [" ","✕","◯"] + draw = function(state) { + space = function(_state,x,y) { + return "
"+symb[_state]+"
" + } + s = "" + x = 0 + y = 0 + for(i=0;i<9;i++) { + s += space((state.box[i] ? 1 : 0)+(state.boo[i] ? 2 : 0),x,y) + x++ + if((i+1)%3 == 0) { + y++ + x=0 + } + } + $bord.html(s) + $whom.html((state.who == 'x' ? symb[1] : symb[2])) + } + + + urb.appl = 'octo' + urb.bind('/octo/o', function(err,res) { + draw(res.data) + }) + + draw({ + box:[false,false,false,false,false,false,false,false,false], + boo:[false,false,false,false,false,false,false,false,false] + }) + + $bord.on('click', function(e) { + $t = $(e.target).closest('.spac') + data = $.map( + $t.attr('data-index').split('-'), + function(i) { return Number(i); }) + urb.send({mark:'octo-move',data:data}) + }) +}) \ No newline at end of file diff --git a/base/sur/sole/core.hook b/base/sur/sole/core.hook index aca52e358..b050ecb96 100644 --- a/base/sur/sole/core.hook +++ b/base/sur/sole/core.hook @@ -89,28 +89,4 @@ leg=(list sole-edit) :: unmerged edits buf=sole-buffer :: sole state == :: -++ dill-belt :: sole input - $% [%aro p=?(%d %l %r %u)] :: arrow key - [%bac ~] :: true backspace - [%cru p=@tas q=(list tank)] :: echo error - [%ctl p=@] :: control-key - [%del ~] :: true delete - [%met p=@] :: meta-key - [%ret ~] :: return - [%rez p=@ud q=@ud] :: resize, cols, rows - [%txt p=(list ,@c)] :: utf32 text - [%yow p=gill] :: connect to app - == :: -++ dill-blit :: sole output - $% [%bel ~] :: make a noise - [%clr ~] :: clear the screen - [%hop p=@ud] :: set cursor position - [%mor p=(list dill-blit)] :: multiple blits - [%pro p=(list ,@c)] :: show as cursor/line - [%qit ~] :: close console - [%out p=(list ,@c)] :: send output line - [%sag p=path q=*] :: save to jamfile - [%sav p=path q=@] :: save to file - == :: -++ gill (pair ship term) :: general contact --