diff --git a/arvo/ames.hoon b/arvo/ames.hoon index c15350b30..42b93bf49 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1521,6 +1521,7 @@ ?- -.bon %beer :_ fox(zac (~(put by zac.fox) p.bon `corn`[hen ~ ~ ~])) + :: ~& [%ames-clop p.bon hen] :* [hen [%slip %c %init p.bon]] [hen [%give %init p.bon]] [hen [%slip %a %kick now]] diff --git a/arvo/batz.hoon b/arvo/batz.hoon index 1a0c5147f..ea95a9f7a 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -8,18 +8,66 @@ :: |% ++ ghat :: out result <-$ - card -:: + $% [%crud p=@tas q=(list tank)] :: error with trace + [%hail ~] :: refresh + [%helo p=path q=prod] :: trigger prompt + [%init p=@p] :: report install + [%line p=@t] :: source line + [%logo p=@] :: logout + [%note p=@tD q=tank] :: show message + [%save p=path q=@] :: write atomic file + [%send p=lane q=@] :: send packet + [%talk p=tank] :: show on console + [%tell p=(list ,@t)] :: dump lines + [%veer p=@ta q=path r=@t] :: install vane + [%vega p=path] :: reboot by path + [%warn p=tape] :: syslog + == :: ++ kiss :: in request ->$ - card -:: + $% [%crud p=@tas q=(list tank)] :: error with trace + [%hail ~] :: refresh + [%init p=@p] :: report install + [%kill p=~] :: kill a task + [%line p=@t] :: source line + [%ling ~] :: rotate interface + [%limn ~] :: rotate ship + [%make p=(unit ,@t) q=@ud r=@ s=?] :: wild license + [%noop ~] :: no operation + [%sith p=@p q=@uw r=?] :: imperial generator + [%wake ~] :: timer activate + [%wart p=sock q=@tas r=path s=*] :: network request + == :: +++ flog :: sent to %dill + $% [%crud p=@tas q=(list tank)] :: + [%text p=tape] :: + == :: ++ move ,[p=duct q=(mold newt ghat)] :: local move -:: ++ newt :: out request $-> - card -:: + $% :: + [%band p=ship q=(list rout)] :: to %eyre + [%flog p=flog] :: to %dill + [%hail ~] :: to %batz + [%info p=@p q=@tas r=nori] :: to %clay + [%line p=@t] :: to %batz + [%make p=(unit ,@t) q=@ud r=@ s=?] :: to %ames + [%sith p=@p q=@uw r=?] :: to %ames + [%that p=@ud q=love] :: to %eyre + [%them p=(unit hiss)] :: to %eyre + [%want p=sock q=path r=*] :: to %ames + [%warp p=sock q=riff] :: to %clay + == :: ++ sign :: in result $-< - card + $% [%crud p=@tas q=(list tank)] :: by any + [%hail ~] :: refresh + [%init p=@p] :: by %ames + [%note p=@tD q=tank] :: by %clay + [%pipe p=(unit ,[p=tutu q=(list)])] :: by %batz + [%send p=lane q=@] :: by %ames + [%thou p=httr] :: by %eyre + [%waft p=sock q=*] :: by %ames + [%went p=ship q=cape] :: by %ames + [%writ p=riot] :: by %clay + == :: -- |% ++ bard :: new session @@ -32,6 +80,23 @@ p.sur 1 p.god 1 == +++ beau ,[p=(unit ,@ud) q=(map wire goal) r=boor] :: next/want/thread +++ beef :: raw product + $: p=(list gilt) :: actions + q=(list slip) :: requests + r=boar :: state + == :: +++ boar :: execution instance + $% [%n p=(unit coal) q=claw r=lath] :: new/ready + [%r p=(unit worm)] :: running/done + [%t p=coal] :: simple filter + == :: +++ boor :: new thread + $: p=(map ,@ud kite) :: dependencies + q=(qeu ,[p=wire q=?(sign kiss)]) :: waiting cards + r=(qeu ,[p=wire q=nose]) :: pending notes + s=boar :: execution + == :: ++ brad :: session/dynamic $: fog=(list ,@ud) :: task consoles fen=(map ,@tas ,@ud) :: named tasks @@ -86,6 +151,11 @@ == ++ brat ,[[who=ship bran] brad] :: don't ask why ++ brim (list ,[p=ship q=brad]) :: session +++ gyro ,[p=@ud q=wire r=prod] :: live prompt +++ task :: + $: paq=(qeu gyro) :: prompt queue + wip=[p=@ud q=(map ,@ud beau)] :: processes + == :: -- :: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 4bB, session engine :: @@ -162,26 +232,46 @@ [r.fat (past:(fest p.fat hen) q.fat)] :: ++ lean :: lean:be - |= [tea=wire hen=duct fav=card] :: deliver card + |= [tea=wire hen=duct sin=sign] :: deliver card ^+ *fi =+ lay=(lead tea hen) ?> ?=([%ma *] p.lay) - abet:(glob:q.lay t.p.lay fav) + abet:(glob:q.lay t.p.lay sin) :: ++ leap :: leap:be - |= [tea=wire hen=duct fav=card] :: handle event + |= [tea=wire hen=duct sin=sign] :: accept response ^- [p=(list move) q=brat] - ?: ?=([%crud *] fav) - [[[hen [%slip %d %flog fav]] ~] +<.^^$] - ?+ -.fav - [[[hen %give fav] ~] +<.^^$] + ?- -.sin + %crud [[[hen [%slip %d %flog sin]] ~] +<.^^$] + %hail [[[hen %give sin] ~] +<.^^$] + %init [[[hen %give sin] ~] +<.^^$] + %note [[[hen %give sin] ~] +<.^^$] + %pipe !! + %send [[[hen %give sin] ~] +<.^^$] + %thou ?. (fear tea) :: legit + [~ +<.^^$] + abet:lash:(lean tea hen sin) + %waft :: ~& [%leap-waft sin] + abet:lash:(lean tea hen sin) + %went ?. (fear tea) + ~& [%went-fear tea] + [~ +<.^^$] + abet:lash:(lean tea hen sin) + %writ abet:lash:(loam tea hen +.sin) + == + :: + ++ lear :: lear:be + |= [hen=duct kyz=kiss] :: handle request + ^- [p=(list move) q=brat] + ?- -.kyz + %crud [[[hen [%slip %d %flog kyz]] ~] +<.^^$] %hail [[[hen [%give %helo prot]] ~] +<.^^$] %line =+ gyp=?>(?=(^ fog) i.fog) - ?: &(=(0 gyp) =(%$ p.fav)) $(fav [%hail ~]) + ?: &(=(0 gyp) =(%$ p.kyz)) $(kyz [%hail ~]) =< abet ?: =(0 gyp) - lash:(gill:(fist hen) p.fav) - lash:(como:(fest gyp hen) p.fav) + lash:(gill:(fist hen) p.kyz) + lash:(como:(fest gyp hen) p.kyz) %kill =+ gyp=?>(?=(^ fog) i.fog) ?: =(0 gyp) [[[hen [%give %logo ~]] ~] +<.^^$] abet:kill:(fest gyp hen) @@ -189,18 +279,8 @@ => .(fog (weld t.fog `(list ,@ud)`[i.fog ~])) [[[hen [%give %helo prot]] ~] +<.^^$] %noop [~ +<.^^$] - %soft $(fav ((hard card) p.fav)) - %thou ?. (fear tea) :: legit - [~ +<.^^$] - abet:lash:(lean tea hen fav) - %waft :: ~& [%leap-waft fav] - abet:lash:(lean tea hen fav) - %went ?. (fear tea) - ~& [%went-fear tea] - [~ +<.^^$] - abet:lash:(lean tea hen fav) - %writ abet:lash:(loam tea hen +.fav) - %wart (lion hen +.fav) + %wart (lion hen +.kyz) + ?(%init %limn %make %sith %wake) !! :: handled earlier == :: ++ leon :: leon:be @@ -269,7 +349,7 @@ :: ++ fi :: fi:be |= [gyp=@ud hen=duct gyr=task] :: process task - =| duv=(list ,[p=duct q=card]) + =| duv=(list move) |% ++ abet :: abet:fi:be ^- [(list move) brat] :: resolve @@ -285,8 +365,8 @@ == :_ +<.^^$ %+ turn - (flop `_duv`?:(sam duv [[~ [%helo prot]] duv])) - |=([p=duct q=card] [(weld p hen) [%sick q]]) + (flop `_duv`?:(sam duv [[~ [%give %helo prot]] duv])) + |=([p=duct q=(mold newt ghat)] [(weld p hen) q]) :: ++ bitt |=(lap=path [(scot %ud gyp) lap]) :: bitt:fi:be ++ como :: como:fi:be @@ -312,7 +392,7 @@ |= [lap=wire ted=@ud] :: XX ugly ^+ +> %= +> - duv :_(duv [[/b ~] [%hail ~]]) + duv :_(duv `move`[~ %toss %b ~ [%hail ~]]) paq.gyr %- ~(gas to *(qeu gyro)) %+ skip @@ -324,7 +404,7 @@ |= [lap=wire ted=@ud pod=prod] :: install prompt ^+ +> %_ +> - duv :_(duv [[/b ~] [%hail ~]]) + duv :_(duv [~ %toss %b ~ [%hail ~]]) paq.gyr (~(put to paq.gyr) [ted lap pod]) == :: @@ -375,7 +455,7 @@ ++ warn :: warn:fi:be |= txt=tape :: send warning ^+ +> - +>(duv :_(duv [~ [%warn txt]])) + +>(duv :_(duv [~ [%give %warn txt]])) :: ++ ra :: ra:fi:be |_ $: ted=@ud :: thread id @@ -460,9 +540,9 @@ %_(+> r.orb (~(put to r.orb) [lap nob])) :: ++ glob :: extern - |= [lap=wire fav=card] + |= [lap=wire sik=?(sign kiss)] ^+ +> - %_(+> q.orb (~(put to q.orb) [lap fav])) + %_(+> q.orb (~(put to q.orb) [lap sik])) :: ++ glum :: blocked thread |= [gez=(list path) hog=boar] @@ -492,6 +572,7 @@ |= sik=skit ^+ +> %+ gram ~ + :- %give :+ %note '^' :- %leaf ;: weld @@ -523,11 +604,11 @@ [%clsg (turn pax |=(a=@ta [%dtzy %ta a]))] :: ++ gram :: add action - |= [hom=duct fav=card] - %_(+> duv [[hom fav] duv]) + |= mov=move + %_(+> duv [mov duv]) :: ++ gran :: add actions - |= vid=(list ,[p=duct q=card]) + |= vid=(list move) ^+ +> ?~(vid +> $(vid t.vid, +> (gram i.vid))) :: @@ -537,7 +618,7 @@ ?- -.ton %0 [[~ p.ton] +>] %1 [~ (glum ((list path) p.ton) s.orb)] - %2 [~ (gram(orb [~ ~ ~ %r ~]) ~ [%crud %exit p.ton])] + %2 [~ (gram(orb [~ ~ ~ %r ~]) ~ [%give %crud %exit p.ton])] == :: ++ grid :: process result @@ -546,7 +627,7 @@ ?- -.ton %0 (fun p.ton) %1 (glum ((list path) p.ton) s.orb) - %2 (gram(orb [~ ~ ~ %r ~]) ~ [%crud %exit p.ton]) + %2 (gram(orb [~ ~ ~ %r ~]) ~ [%give %crud %exit p.ton]) == :: ++ grin :: process result @@ -555,7 +636,7 @@ ?- -.ton %0 (haul (fret p.ton)) %1 (glum ((list path) p.ton) hog) - %2 (gram(orb [~ ~ ~ %r ~]) ~ [%crud %exit p.ton]) + %2 (gram(orb [~ ~ ~ %r ~]) ~ [%give %crud %exit p.ton]) == :: ++ grip :: step to completion @@ -709,7 +790,7 @@ :: ++ gull :: request control |= [tea=wire him=ship ryf=riff] - (gram ~[/c [%b tea]] [%warp [who him] ryf]) + (gram ~ %toss %c tea [%warp [who him] ryf]) :: ++ gulf :: stop request |= [tea=wire kit=kite] @@ -750,11 +831,11 @@ ^+ +> ?~ nex ?~ pun +> - (gran (turn q.u.pun |=(a=* [~ (gyve p.u.pun a)]))) + (gran (turn q.u.pun |=(a=* [~ %give (gyve p.u.pun a)]))) +>.$(..ra abet:(glob:(past u.nex) ~ [%pipe pun])) :: ++ gyve :: print vase - |= [toy=tutu val=*] ^- card + |= [toy=tutu val=*] ^- ghat =+ caf=((hard calf) (need (mang [felt:zu toy] sky))) :: ?: =([~ [%atom %t]] caf) :: [%tell ((hard ,@t) val) ~] @@ -787,32 +868,42 @@ +>.^$(loq p.gud) %ck +>.^$(cwd p.gud) %cs +>.^$(cws p.gud) - %de (gram ~ %note '#' q.gud) + %de (gram ~ %give %note '#' q.gud) %ex =. +>.^$ guff +>.^$(s.orb [%n p.gud *claw q.gud]) - %ha (gram ~ %crud %soft [p.gud ~]) - %ho (gram ~ %crud %soft p.gud) - %la (gram ~ %talk p.gud) - %lo (gran (turn p.gud |=(a=tank [~ %talk a]))) + %ha (gram ~ %give %crud %soft [p.gud ~]) + %ho (gram ~ %give %crud %soft p.gud) + %la (gram ~ %give %talk p.gud) + %lo (gran (turn p.gud |=(a=tank [~ %give %talk a]))) %mu !! %mx |- ^+ +>.^^$ ?~ p.gud +>.^^$ $(p.gud t.p.gud, +>.^^$ ^$(gud i.p.gud)) - %ok (gram [/c ~] %info who p.gud q.gud) + %ok (gram ~ %toss %c ~ %info who p.gud q.gud) %sc good:+>.^$(sac ?~(p.gud ?~(sac ~ +.sac) [u.p.gud sac])) %sp !! %sq =+ tea=(bist %ma r.gud) - %+ gram - [/a [%b tea] ~] - [%want [who p.gud] [%q q.gud %b tea] s.gud] - %sr (gram [/a /b ~] [%want [who p.gud] [%r q.gud] r.gud]) - %te (gram ~ %tell p.gud) - %th (gram [/e ~] %that p.gud q.gud) + %+ gram ~ + [%toss %a tea [%want [who p.gud] [%q q.gud %b tea] s.gud]] + %sr (gram ~ %toss %a ~ [%want [who p.gud] [%r q.gud] r.gud]) + %te (gram ~ %give %tell p.gud) + %th (gram ~ %toss %e ~ %that p.gud q.gud) %tq =+ tea=(bist %ma p.gud) - (gram [/e [%b tea] ~] [%them ~ q.gud]) + (gram ~ %toss %e tea [%them ~ q.gud]) %va !! - %xx (gram ~ p.gud) - %xy (gram [p.gud /b ~] q.gud) + %xx =+ gah=((soft ghat) p.gud) + ?~ gah + ~& [%batz-xx (,@tas -.p.gud)] + !! + (gram ~ %give u.gah) + %xy =+ hug=((soft newt) q.gud) + ?~ hug + ~& [%batz-xy (,@tas -.q.gud)] + !! + ?. ?=([@ ~] p.gud) + ~& [%batz-xyz p.gud] + !! + (gram ~ %toss i.p.gud ~ u.hug) == == :: @@ -838,7 +929,7 @@ %es :: ~& %es-loss (gull (bist %ma lap) p.gal q.gal ~) %hp +> - %ht (gram [/e [%b (bist [%ma lap])] ~] [%band who ~]) + %ht (gram ~ %toss %e (bist [%ma lap]) [%band who ~]) %lq (gump | p.gal gyp ted lap) %ow +> %rt +> @@ -856,7 +947,7 @@ %es :: ~& %es-moor (gull (bist %ma lap) p.gal q.gal [~ r.gal]) %hp +> - %ht (gram [/e [%b (bist [%ma lap])] ~] [%band who p.gal]) + %ht (gram ~ %toss %e [%b (bist [%ma lap])] [%band who p.gal]) %lq (gump & p.gal [gyp ted lap]) %ow +> %rt +> @@ -883,74 +974,74 @@ ++ pane |=(gal=goal %_(. lug [~ gal])) :: set goal ++ pang %_(. lug ~) :: delete goal ++ pong :: accept card - |= fav=card + |= sik=?(sign kiss) ^+ +> ?> ?=(^ lug) ?- -.u.lug ~ - ?> ?=(%pipe -.fav) - +>.$(+>.$ (glib lap [%$ p.fav])) + ?> ?=(%pipe -.sik) + +>.$(+>.$ (glib lap [%$ p.sik])) :: %do !! :: %eg - ?> ?=(%writ -.fav) - +>.$(lug ~, +>.$ (glib lap [%eg +.fav])) + ?> ?=(%writ -.sik) + +>.$(lug ~, +>.$ (glib lap [%eg +.sik])) :: %es - ?> ?=(%writ -.fav) + ?> ?=(%writ -.sik) =+ ^= goh ^- (unit goal) - ?~ p.fav `(unit goal)`~ + ?~ p.sik `(unit goal)`~ ?- -.r.u.lug %& ~ %| ^- (unit goal) :- ~ - ?> ?=(%ud -.q.p.u.p.fav) + ?> ?=(%ud -.q.p.u.p.sik) %= u.lug p.p.r ?> ?| !=(%ud -.p.p.r.u.lug) - =(p.p.p.r.u.lug p.q.p.u.p.fav) + =(p.p.p.r.u.lug p.q.p.u.p.sik) == - [%ud +(p.q.p.u.p.fav)] + [%ud +(p.q.p.u.p.sik)] == == =. loz ?~(goh (~(del by loz) lap) (~(put by loz) lap u.goh)) %= +>.$ lug goh gul goh - +>.$ (glib lap [%eg +.fav]) + +>.$ (glib lap [%eg +.sik]) == :: %hp - ?> ?=(%thou -.fav) - +>.$(+>.$ (glib lap [%hp +.fav])) + ?> ?=(%thou -.sik) + +>.$(+>.$ (glib lap [%hp +.sik])) :: %ht !! - :: ?> ?=(%thee -.fav) - :: +>.$(+>.$ (glib lap [%ht +.fav])) + :: ?> ?=(%thee -.sik) + :: +>.$(+>.$ (glib lap [%ht +.sik])) :: %lq - ?> ?=(%wart -.fav) - +>.$(+>.$ (glib lap [%lq q.p.fav r.fav s.fav])) + ?> ?=(%wart -.sik) + +>.$(+>.$ (glib lap [%lq q.p.sik r.sik s.sik])) :: %rt - ?: ?=(%went -.fav) - ?. ?=(%dead q.fav) +>.$ + ?: ?=(%went -.sik) + ?. ?=(%dead q.sik) +>.$ +>.$(+>.$ (glib lap [%rt ~])) - ?> ?=(%waft -.fav) - +>.$(+>.$ (glib lap [%rt ~ q.fav])) + ?> ?=(%waft -.sik) + +>.$(+>.$ (glib lap [%rt ~ q.sik])) :: %up - ?> ?=(%line -.fav) - +>.$(+>.$ (glib lap [%up +.fav])) + ?> ?=(%line -.sik) + +>.$(+>.$ (glib lap [%up +.sik])) :: %ow - ?> ?=(%went -.fav) - +>.$(+>.$ (glib lap [%ow q.fav])) + ?> ?=(%went -.sik) + +>.$(+>.$ (glib lap [%ow q.sik])) :: %wa - ?> ?=(%wake -.fav) + ?> ?=(%wake -.sik) +>.$(+>.$ (glib lap [%wa ~])) == -- @@ -1166,111 +1257,24 @@ |= [now=@da eny=@ ski=sled] :: current invocation ^? :: opaque core |% :: poke/peek pattern -++ take :: process move - |= [tea=wire hen=duct hin=(hypo sign)] +++ call :: handle request + |= $: hen=duct + hic=(hypo (hobo kiss)) + == + :: ~& [%batz-call-a -.q.hic] + =. hic =+ kyt=-:!>(q.hic) :: XX temporary + ?: (~(nest ut kyt) | p.hic) + hic + ~& [%clay-call-flub -.q.hic] + [kyt ((hard (hobo kiss)) q.hic)] + ?: ?=(%soft -.q.hic) + $(q.hic ((hard (hobo kiss)) p.q.hic)) + :: ~& [%batz-call-b -.q.hic] ^- [p=(list move) q=_..^$] - :: ~& [%batz-take -.q.hin [%tea tea] [%hen hen]] - =+ ska=(slod ski) - =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) - ?: ?=([%crud *] q.hin) - [[[hen [%slip %d %flog q.hin]] ~] ..^$] - ?: ?=([%soft *] q.hin) - $(q.hin ((hard card) p.q.hin)) - ?: ?=(%wake -.q.hin) - =+ ^= fiy - =| fiy=(list ,[p=duct q=ship r=[p=@ud q=@ud r=wire]]) - |- ^+ fiy - ?~ dez fiy - =. fiy $(dez l.dez) - =. fiy $(dez r.dez) - |- ^+ fiy - ?~ q.n.dez fiy - %= $ - q.n.dez t.q.n.dez - fiy - |- ^+ fiy - ?~ tem.q.i.q.n.dez fiy - =. fiy $(tem.q.i.q.n.dez l.tem.q.i.q.n.dez) - =. fiy $(tem.q.i.q.n.dez r.tem.q.i.q.n.dez) - ?. (lte q.n.tem.q.i.q.n.dez now) fiy - [[p.n.dez p.i.q.n.dez p.n.tem.q.i.q.n.dez] fiy] - == - =| wam=(list move) - |- ^- [p=(list move) q=_..^^$] - ?~ fiy [wam ..^^$] - =+ dos=(need (~(get by dez) p.i.fiy)) - =+ suy=|-(`brad`?~(dos !! ?.(=(q.i.fiy p.i.dos) $(dos t.dos) q.i.dos))) - =+ geb=((be [[q.i.fiy bred] suy]) now eny sky) - =+ ^= yub ^- [p=(list move) q=brat] - ?. (fang:geb r.i.fiy) - ~& [%time-lost r.i.fiy] - [~ abet:(flub:geb r.i.fiy)] - (lake:geb p.i.fiy r.i.fiy) - %= $ - fiy t.fiy - wam (weld p.yub wam) - dez.^^$ (~(put by dez.^^$) p.i.fiy [[q.i.fiy +.q.yub] +.dos]) - == - |- ^- [p=(list move) q=_..^^$] - =+ dus=(~(get by dez) hen) - ?~ dus - ?+ -.q.hin - ~& [%take-none -.q.hin tea hen] - ~|([%take-none -.q.hin] !!) - :: - %hail - ?~ big - ~& [%take-hail-soon hen] - [~ ..^^$] - ~& [%batz-hack-console hen] - $(dez (~(put by dez) hen [[u.big (bard u.big)] ~])) - :: - %init - :: ~& [%take-init p.q.hin hen] - =. big ?~ big - `p.q.hin - `(min p.q.hin u.big) - =+ bos=(sein p.q.hin) - :- :- [hen [%give q.hin]] - ?: =(bos p.q.hin) ~ - :_ ~ - [hen [%slip %b %line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] - ..^^$(dez (~(put by dez) hen [[p.q.hin (bard p.q.hin)] ~])) - :: - ?(%loin %make %sith) - [[[hen [%toss %a tea q.hin]] ~] ..^^$] - == - ?> ?=(^ u.dus) - ?+ -.q.hin - =+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus] - =+ yub=(leap:((be beg) now eny sky) tea hen q.hin) - :- p.yub - ..^^$(dez (~(put by dez) hen [[p.i.u.dus +.q.yub] t.u.dus])) - :: - %init - =+ bos=(sein p.q.hin) - :- :* [hen %give q.hin] - [[[%b tea] hen] [%sick %hail ~]] - ?: =(bos p.q.hin) ~ - :_ ~ - [[/b hen] [%sick %line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] - == - ..^^$(dez (~(put by dez) hen [[p.q.hin (bard p.q.hin)] u.dus])) - :: - %limn - $(q.hin [%hail ~], dez (~(put by dez) hen (weld t.u.dus `brim`[i.u.dus ~]))) - == -:: -++ call :: process move - |= [hen=duct hic=(hypo kiss)] - ^- [p=(list move) q=_..^$] - :: ~& [%batz-take -.q.hic [%tea tea] [%hen hen]] =+ ska=(slod ski) =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) ?: ?=([%crud *] q.hic) [[[hen [%slip %d %flog q.hic]] ~] ..^$] - ?: ?=([%soft *] q.hic) - $(q.hic ((hard card) p.q.hic)) ?: ?=(%wake -.q.hic) =+ ^= fiy =| fiy=(list ,[p=duct q=ship r=[p=@ud q=@ud r=wire]]) @@ -1315,9 +1319,9 @@ :: %hail ?~ big - ~& [%take-hail-soon hen] + ~& [%call-hail-soon hen] [~ ..^^$] - ~& [%batz-hack-console hen] + ~& [%batz-call-console hen] $(dez (~(put by dez) hen [[u.big (bard u.big)] ~])) :: %init @@ -1332,34 +1336,19 @@ [hen [%slip %b %line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] ..^^$(dez (~(put by dez) hen [[p.q.hic (bard p.q.hic)] ~])) :: - ?(%loin %make %sith) + ?(%make %sith) [[[hen [%toss %a ~ q.hic]] ~] ..^^$] == ?> ?=(^ u.dus) - ?+ -.q.hic - =+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus] - =+ yub=(leap:((be beg) now eny sky) ~ hen q.hic) - :- p.yub - ..^^$(dez (~(put by dez) hen [[p.i.u.dus +.q.yub] t.u.dus])) - :: - %init - =+ bos=(sein p.q.hic) - :- :* [hen %give q.hic] - [[[%b ~] hen] [%sick %hail ~]] - ?: =(bos p.q.hic) ~ - :_ ~ - [[/b hen] [%sick %line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] - == - ..^^$(dez (~(put by dez) hen [[p.q.hic (bard p.q.hic)] u.dus])) - :: - %limn - $(q.hic [%hail ~], dez (~(put by dez) hen (weld t.u.dus `brim`[i.u.dus ~]))) - == + =+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus] + =+ yub=(lear:((be beg) now eny sky) hen q.hic) + :- p.yub + ..^^$(dez (~(put by dez) hen [[p.i.u.dus +.q.yub] t.u.dus])) :: ++ doze |= [now=@da hen=duct] ^- (unit ,@da) - =| doz=(unit ,@da) + =| doz=(unit ,@da) |- ^+ doz ?~ dez doz =. doz $(dez l.dez) @@ -1387,4 +1376,48 @@ ~ :: ++ stay [%0 big dez] +++ take :: accept response + |= [tea=wire hen=duct hin=(hypo sign)] + :: ~& [%batz-take-a -.q.hin] + =. hin =+ kyn=-:!>(q.hin) :: XX temporary + ?: (~(nest ut kyn) | p.hin) + hin + ~& [%batz-take-flub -.q.hin] + [kyn ((hard sign) q.hin)] + :: ~& [%batz-take-b -.q.hin] + ^- [p=(list move) q=_..^$] + :: ~& [%batz-take -.q.hin [%tea tea] [%hen hen]] + =+ ska=(slod ski) + =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) + ?: ?=([%crud *] q.hin) + [[[hen [%slip %d %flog q.hin]] ~] ..^$] + =+ dus=(~(get by dez) hen) + ?~ dus + ?+ -.q.hin + ~&([%take-none -.q.hin] !!) + :: + ?(%hail %send) + ?~ big + ~& [%take-hail-soon hen] + [~ ..^$] + :: ~& [%batz-take-console hen] + $(dez (~(put by dez) hen [[u.big (bard u.big)] ~])) + :: + %init + :: ~& [%take-init p.q.hin hen] + =. big ?~ big + `p.q.hin + `(min p.q.hin u.big) + =+ bos=(sein p.q.hin) + :- :- [hen [%give q.hin]] + ?: =(bos p.q.hin) ~ + :_ ~ + [hen [%slip %b %line (rap 3 ":{(scow %p bos)}/main=/bin/update")]] + ..^$(dez (~(put by dez) hen [[p.q.hin (bard p.q.hin)] ~])) + == + ?> ?=(^ u.dus) + =+ beg=`brat`[[p.i.u.dus bred] q.i.u.dus] + =+ yub=(leap:((be beg) now eny sky) tea hen q.hin) + :- p.yub + ..^$(dez (~(put by dez) hen [[p.i.u.dus +.q.yub] t.u.dus])) -- diff --git a/arvo/clay.hoon b/arvo/clay.hoon index e48a57bd1..7178f62b3 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -1,4 +1,4 @@ -:: +!: :: clay (4c), revision control :: |= pit=vase @@ -6,6 +6,7 @@ ++ gift :: out result <-$ $% [%ergo p=@p q=@tas r=@ud] :: version update [%note p=@tD q=tank] :: debug message + [%send p=lane q=@] :: send packet [%writ p=riot] :: response == :: ++ kiss :: in request ->$ @@ -26,6 +27,7 @@ == :: ++ sign :: in result $-< $% [%crud p=@tas q=(list tank)] :: by any + [%send p=lane q=@] :: send packet [%waft p=sock q=*] :: by %ames [%went p=ship q=cape] :: by %ames [%writ p=riot] :: by %clay @@ -473,12 +475,15 @@ =. hin =+ kyn=-:!>(q.hin) :: XX temporary ?: (~(nest ut kyn) | p.hin) hin - ~& [%eyre-take-flub -.q.hin] + ~& [%clay-take-flub -.q.hin] [kyn ((hard sign) q.hin)] ^- [p=(list move) q=_..^$] ?- -.q.hin %crud [[[hen %slip %d %flog q.hin] ~] ..^$] + :: + %send + [[hen %give q.hin]~ ..^$] :: %waft ?> ?=([@ @ ~] tea) diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index ae9ce6b33..889dbdd0f 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1,4 +1,4 @@ -!: :: %eyre, http servant +:: :: %eyre, http servant !? 164 :::: |= pit=vase diff --git a/arvo/ford.hoon b/arvo/ford.hoon index b50c579c9..5f6ec824f 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -1,4 +1,4 @@ -!: :: %ford, new execution control +:: :: %ford, new execution control !? 164 :::: |= pit=vase diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 8e5f46413..5d72bcca0 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1,4 +1,4 @@ -!: :: %gall, user-level applications +:: :: %gall, user-level applications !? 164 :::: |= pit=vase @@ -21,7 +21,6 @@ == :: ++ kiss :: in request ->$ $% [%cuff p=(unit cuff) q=kiss] :: controlled kiss - [%crud p=@tas q=(list tank)] :: XX rethink [%mesh p=hasp q=path r=json] :: web message (json) [%mess p=hasp q=cage] :: urbit message [%mush p=hasp q=path r=cage] :: web message (mime) diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 58eef0e1e..adcfed1d4 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2022,14 +2022,7 @@ pot=tape :: prompt text == :: == :: -++ beau ,[p=(unit ,@ud) q=(map wire goal) r=boor] :: next/want/thread ++ beak ,[p=ship q=desk r=case] :: garnish with beak -++ bear ,[p=(map path goal) q=boar] :: thread with slips -++ beef :: raw product - $: p=(list gilt) :: actions - q=(list slip) :: requests - r=boar :: state - == :: ++ beet ,[p=(set bead) q=cage] :: computed result ++ bird :: packet in travel $: gom=soap :: message identity @@ -2062,17 +2055,6 @@ r=(list (list ,@c)) :: kills == :: ++ blur ,[p=@ud q=(unit bein) r=blot] :: columns, prompt -++ boar :: execution instance - $% [%n p=(unit coal) q=claw r=lath] :: new/ready - [%r p=(unit worm)] :: running/done - [%t p=coal] :: simple filter - == :: -++ boor :: new thread - $: p=(map ,@ud kite) :: dependencies - q=(qeu ,[p=wire q=card]) :: incoming cards - r=(qeu ,[p=wire q=nose]) :: pending notes - s=boar :: execution - == :: ++ boat ,[(list slip) tart] :: user stage ++ boon :: fort output $% [%beer p=ship q=@uvG] :: gained ownership @@ -2083,17 +2065,6 @@ [%wine p=sock q=tape] :: notify user == :: ++ bowl ,[p=(list gift) q=(unit boat)] :: app product -++ brad :: shell state - $: who=ship :: identity - fog=(list ,@ud) :: virtual consoles - hox=@ta :: identity text - cwd=@tas :: working desk - cws=path :: working spur - way=(map ,@tas vase) :: variables - hit=[p=@ud q=(list ,@t)] :: command history - sur=[p=@ud q=(qeu vase)] :: result history - god=[p=@ud q=(map ,@ud task)] :: tasks - == :: ++ bray ,[p=life q=(unit life) r=ship s=@da] :: our parent us now ++ brow ,[p=@da q=@tas] :: browser version ++ buck ,[p=mace q=will] :: all security data @@ -2343,7 +2314,6 @@ == :: ++ govt path :: country/postcode ++ gram ,@uw :: physical datagram -++ gyro ,[p=@ud q=wire r=prod] :: live prompt ++ hand ,@uvH :: hash of code ++ hart ,[p=? q=(unit ,@ud) r=host] :: http sec/port/host ++ hasp ,[p=ship q=term] :: app identity @@ -2636,10 +2606,6 @@ ++ step ,[p=bray q=gens r=pass] :: identity stage ++ tako ,[p=path q=miso] :: change detail ++ tart $+([@da path note] bowl) :: process core -++ task :: - $: paq=(qeu gyro) :: prompt queue - wip=[p=@ud q=(map ,@ud beau)] :: processes - == :: ++ taxi ,[p=lane q=rock] :: routed packet ++ tick ,@ud :: process id ++ toro ,[p=@ta q=nori] :: general change