From 802a76a2793c23f44922da9717b76f7a1451c7da Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 8 May 2015 12:43:11 -0700 Subject: [PATCH] Command-line functionality with %behn. --- base/ape/dojo/core.hook | 44 +++++---- base/ape/helm/core.hook | 6 +- base/ape/sole/core.hook | 2 +- base/ape/talk/core.hook | 12 +-- base/arvo/behn.hoon | 60 ++++++++----- base/arvo/dill.hoon | 193 ++++++++++++++-------------------------- base/arvo/doll.hoon | 2 +- base/arvo/eyre.hoon | 2 +- 8 files changed, 144 insertions(+), 177 deletions(-) diff --git a/base/ape/dojo/core.hook b/base/ape/dojo/core.hook index 685173943..235a4a406 100644 --- a/base/ape/dojo/core.hook +++ b/base/ape/dojo/core.hook @@ -70,10 +70,6 @@ == :: ++ bead ,[p=(set beam) q=cage] :: computed result ++ goal ,[p=ship q=term] :: flat application - ++ note :: general note - $% [%exec @p (unit silk)] :: - [%deal sock term club] :: - == :: ++ clap :: action, user $% [%peer p=path] :: subscribe [%poke p=term q=*] :: apply @@ -87,7 +83,7 @@ ++ card :: general card $% [%diff %sole-effect sole-effect] :: [%send wire [ship term] clap] :: - [%exec wire @p (unit silk)] :: + [%exec wire @p beak (unit silk)] :: [%deal wire sock term club] :: == :: ++ move (pair bone card) :: user-level move @@ -128,23 +124,32 @@ [%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 - [%done p=(set beam) q=cage] :: literal + [%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 cage)] :: unit literal + [%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 == :: ++ sign :: - $% [%made p=@uvH q=(each cage tang)] :: + $% [%made p=@uvH q=(each gage tang)] :: [%unto p=cuft] :: == :: -- :: @@ -271,16 +276,20 @@ |_ dojo-project :: ++ dy-abet +>(poy `+<) :: resolve ++ dy-amok +>(poy ~) :: terminate + ++ dy-beak :: XX rethink + ^- beak + [our.hid %base [%da lat.hid]] + :: ++ dy-ford :: send work to ford |= [way=wire kas=silk] ^+ +>+> ?> ?=(~ pux) - (he-card(poy `+>+<(pux `way)) %exec way our.hid `kas) + (he-card(poy `+>+<(pux `way)) %exec way our.hid dy-beak `kas) :: ++ dy-stop :: stop work ^+ +> ?~ pux +> - (he-card(poy ~) %exec u.pux our.hid ~) + (he-card(poy ~) %exec u.pux our.hid dy-beak ~) :: ++ dy-slam :: call by ford |= [way=wire gat=vase sam=vase] @@ -613,12 +622,13 @@ [& %$ "> "] :: ++ he-made :: result from ford - |= [way=wire dep=@uvH rey=(each cage tang)] + |= [way=wire dep=@uvH reg=(each gage tang)] ^+ +> ?> ?=(^ poy) =< he-pine - ?- -.rey - %& %. p.rey + ?- -.reg + %& ?> ?=(@ p.p.reg) + %. p.reg =+ dye=~(. dy u.poy(pux ~)) ?+ way !! [%hand ~] dy-hand:dye @@ -627,7 +637,7 @@ [%edit ~] dy-made-edit:dye == %| ~& [%he-made-fail way] - (he-diff(poy ~) %tan p.rey) + (he-diff(poy ~) %tan p.reg) == :: ++ he-unto :: result from behn @@ -713,7 +723,7 @@ :- [ost ~] ^- session :* *sole-share :: say=sole-share - %main :: syd=desk + %base :: syd=desk ~ :: luc=(unit case) ~ :: poy=(unit dojo-project) ~ :: var=(map term cage) @@ -728,8 +738,8 @@ he-abet:(~(he-type he [ost ~] (~(got by hoc) ost)) act) :: ++ made - |= [then dep=@uvH rey=(each cage tang)] - he-abet:(~(he-made he [[ost ~] (~(got by hoc) ost)]) way dep rey) + |= [then dep=@uvH reg=(each gage tang)] + he-abet:(~(he-made he [[ost ~] (~(got by hoc) ost)]) way dep reg) :: ++ unto |= [then cit=cuft] diff --git a/base/ape/helm/core.hook b/base/ape/helm/core.hook index e75c15d01..b71b14960 100644 --- a/base/ape/helm/core.hook +++ b/base/ape/helm/core.hook @@ -61,7 +61,7 @@ ^+ . =- %_(+ moz (weld zum moz)) ^= zum %- flop ^- (list move) - =+ top=`path`/(scot %p our.hid)/arvo/(scot %da lat.hid) + =+ 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]) @@ -86,7 +86,7 @@ %- weld :_ moz %+ turn all - =+ ark=(arch .^(%cy /(scot %p our.hid)/arvo/(scot %da lat.hid))) + =+ ark=(arch .^(%cy /(scot %p our.hid)/base/(scot %da lat.hid)/arvo)) =+ van=(~(tap by r.ark)) |= nam=@tas =. nam @@ -97,7 +97,7 @@ ?> ?=([[@ ~] ~] zaz) `term`p.i.zaz =+ tip=(end 3 1 nam) - =+ way=[(scot %p our.hid) %arvo (scot %da lat.hid) nam %hoon ~] + =+ way=[(scot %p our.hid) %base (scot %da lat.hid) %arvo nam %hoon ~] =+ fil=(,@ .^(%cx way)) :* ost %flog diff --git a/base/ape/sole/core.hook b/base/ape/sole/core.hook index 91e16a4bd..ea9ec524b 100644 --- a/base/ape/sole/core.hook +++ b/base/ape/sole/core.hook @@ -198,7 +198,7 @@ |= gyl=gill ^+ +> =. +> ?. =(p.gyl src) +> - (se-emit ost %conf (se-path gyl) gyl %load src %main) + (se-emit ost %conf (se-path gyl) gyl %load src %base) (se-join:(se-peer gyl /sole) gyl) :: ++ se-blit :: give output diff --git a/base/ape/talk/core.hook b/base/ape/talk/core.hook index 7c21752bb..b935d8575 100644 --- a/base/ape/talk/core.hook +++ b/base/ape/talk/core.hook @@ -1717,12 +1717,12 @@ =^ moz +>.$ ra-abet:ra-ever:~(ra-cancel ra ost ~) [moz +>.$(shells (~(del by shells) ost))] :: -++ poke-bit - |= [from ~] - ^- (quip move +>) - :_ +>.$ - =+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/talk/backlog/jam - [ost %info /jamfile our.hid (foal paf (jam +<+.+>.$))]~ +::++ poke-bit +:: |= [from ~] +:: ^- (quip move +>) +:: :_ +>.$ +:: =+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/talk/backlog/jam +:: [ost %info /jamfile our.hid (foal paf (jam +<+.+>.$))]~ :: ++ prep |= [from old=(unit house)] diff --git a/base/arvo/behn.hoon b/base/arvo/behn.hoon index 8042c4858..dd3172ad0 100644 --- a/base/arvo/behn.hoon +++ b/base/arvo/behn.hoon @@ -35,20 +35,29 @@ [%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 - [%done p=(set beam) q=cage] :: literal + [%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 cage)] :: unit literal + [%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 - [%plan p=beam q=spur r=hood] :: structured build + [%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 @@ -107,7 +116,7 @@ [%roth p=sack q=path r=*] :: remote response == :: ++ kiss-ford :: - $% [%exec p=@p q=(unit silk)] :: make / kill + $% [%exec p=@p q=beak r=(unit silk)] :: make / kill [%wasp p=@p q=@uvH] :: depends query == :: ++ gift-ames :: @@ -119,11 +128,11 @@ [%mack p=(unit tang)] :: message ack == :: ++ gift-ford :: out result <-$ - $% [%made p=@uvH q=(each cage tang)] :: computed result + $% [%made p=@uvH q=(each gage tang)] :: computed result [%news ~] :: fresh depends == :: ++ sign-behn :: incoming result - $% [%a gift-ames] + $% [%a gift-ames] :: [%b gift-behn] :: [%f gift-ford] :: == :: @@ -239,15 +248,16 @@ (~(nest ut -:!>(*hide)) %| p:(slot 12 vax)) :: ++ mo-boom :: complete new boot - |= [dap=dude pup=scup dep=@uvH cux=(each cage tang)] + |= [dap=dude pup=scup dep=@uvH gux=(each gage tang)] ^+ +> - ?- -.cux - %| (mo-give %onto %| p.cux) + ?- -.gux + %| (mo-give %onto %| p.gux) %& - ?. (mo-okay q.p.cux) + ?> ?=(@ p.p.gux) + ?. (mo-okay q.p.gux) (mo-give %onto %| [%leaf "{}: bogus core"]~) =. +> (mo-bold dap dep) - =. +> (mo-born dap pup q.p.cux) + =. +> (mo-born dap pup q.p.gux) =+ old=+>.$ =+ wag=(ap-prop:(ap-abed:ap dap [%high [~ our]]) ~) ?^ -.wag @@ -274,15 +284,16 @@ == :: ++ mo-boon :: complete old boot - |= [dap=dude pup=scup dep=@uvH cux=(each cage tang)] + |= [dap=dude pup=scup dep=@uvH gux=(each gage tang)] ^+ +> ?. (~(has by bum) dap) ~& [%behn-old-boon dap] +> =. +> (mo-bold dap dep) - ?- -.cux - %| (mo-give %onto %| p.cux) - %& ap-abet:(ap-peep:(ap-abed:ap dap [%high [~ our]]) q.p.cux) + ?- -.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 @@ -296,8 +307,9 @@ ^+ +> :: ~& [%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 `[%boil %core [[p.pup q.pup [%da now]] [dap %ape ~]] ~]] + [%f %exec our bek `[%boil %core [bek [dap %ape ~]] ~]] :: ++ mo-away :: foreign request |= [him=ship caz=cuss] :: @@ -426,7 +438,8 @@ == ?- -.q.+>.sih %| (mo-give %mack `p.q.+>.sih) :: XX should crash - %& =. +>.$ (mo-give %mack ~) :: XX pump should ack + %& ?> ?=(@ p.p.q.+>.sih) + =. +>.$ (mo-give %mack ~) :: XX pump should ack (mo-give(hen (mo-ball him num)) %unto %diff `cage`p.q.+>.sih) == :: @@ -439,7 +452,8 @@ ?: ?=([%f %made *] sih) ?- -.q.+>.sih %| (mo-give %mack `p.q.+>.sih) :: XX should crash - %& (mo-pass [%sys pax] %b %deal [him our] i.t.t.pax %poke p.q.+>.sih) + %& ?> ?=(@ 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) @@ -496,6 +510,12 @@ :: ~& [%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 + :: ++ mo-club :: local action |= [dap=dude pry=prey cub=club] ^+ +> @@ -511,7 +531,7 @@ [%sys %req (scot %p him) dap (scot %ud num) ~] ^- note-behn ?- -.rok - %m [%f %exec our ~ %vale p.rok our q.rok] :: XX use build beak + %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 ~] == @@ -522,7 +542,7 @@ %d %+ mo-pass [%sys %rep (scot %p him) dap (scot %ud num) ~] - [%f %exec our ~ %vale p.ron our q.ron] + [%f %exec our (mo-beak dap) ~ %vale p.ron our q.ron] :: %x (mo-give(hen (mo-ball him num)) %unto %quit ~) == diff --git a/base/arvo/dill.hoon b/base/arvo/dill.hoon index 76de83142..53ff45f48 100644 --- a/base/arvo/dill.hoon +++ b/base/arvo/dill.hoon @@ -1,5 +1,5 @@ !: -:: dill (4d), terminal handling +:: dill (4d), terminal handling :: |= pit=vase => |% :: interface tiles @@ -59,26 +59,12 @@ ++ gill (pair ship term) :: general contact -- :: => |% :: console protocol -++ old-axle :: all dill state +++ axle :: all dill state $: %2 :: ore=(unit ship) :: identity once set hey=(unit duct) :: default duct dug=(map duct axon) :: conversations == :: -++ axle :: all dill state - $: %3 :: - ore=(unit ship) :: identity once set - hey=(unit duct) :: default duct - dug=(map duct axon) :: conversations - $= hef :: other weights - $: a=(unit mass) :: - c=(unit mass) :: - e=(unit mass) :: - f=(unit mass) :: - g=(unit mass) :: - t=(unit mass) :: - == :: - == :: ++ axon :: dill per duct $: ram=term :: console program tem=(unit (list dill-belt)) :: pending, reverse @@ -108,9 +94,8 @@ [%sav p=path q=@] :: save to file == :: ++ flog :: sent to %dill - $% [%crud p=@tas q=(list tank)] :: error with trace - [%heft ~] :: system memory - [%text p=tape] :: print text + $% [%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 @@ -120,7 +105,6 @@ [%blit p=(list blit)] :: terminal output [%init p=@p] :: set owner [%logo ~] :: logout - [%mass p=mass] :: memory usage [%veer p=@ta q=path r=@t] :: install vane [%vega p=path] :: reboot by path [%verb ~] :: verbose mode @@ -133,7 +117,6 @@ [%flog p=flog] :: wrapped error [%flow p=@tas q=(list gill)] :: terminal config [%hail ~] :: terminal refresh - [%heft ~] :: system memory [%hook ~] :: this term hung up [%harm ~] :: all terms hung up [%init p=ship] :: after gall ready @@ -149,6 +132,20 @@ ++ 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 $% [%make p=(unit ,@t) q=@ud r=@ s=?] :: @@ -160,31 +157,30 @@ == :: ++ note-dill :: note to self, odd $% [%crud p=@tas q=(list tank)] :: - [%heft ~] :: [%init p=ship] :: [%text p=tape] :: [%veer p=@ta q=path r=@t] :: install vane [%vega p=path] :: reboot by path [%verb ~] :: verbose mode == :: -++ note-gall :: outbound message - $% [%mess p=[ship q=path] q=ship r=mess] :: - [%nuke p=[p=ship q=path] q=ship] :: - [%show p=[p=ship q=path] q=ship r=path] :: - [%took p=[p=ship q=path] q=ship] :: +++ note-behn :: + $% [%conf dock %load ship desk] :: + [%deal p=sock q=cuss] :: == :: -++ note :: - $? [?(%a %c %e %f %g %t) %wegh ~] :: - $% [%a note-ames] :: out request $-> +++ note :: out request $-> + $% [%a note-ames] :: + [%b note-behn] :: [%c note-clay] :: [%d note-dill] :: - [%g note-gall] :: - == == :: + == :: ++ riff ,[p=desk q=(unit rave)] :: see %clay ++ sign-ames :: $% [%nice ~] :: [%init p=ship] :: == :: +++ sign-behn :: see %behn + $% [%onto p=(unit tang)] :: + == :: ++ sign-clay :: $% [%mere p=(each (set path) (pair term tang))] :: [%note p=@tD q=tank] :: @@ -193,23 +189,20 @@ ++ sign-dill :: $% [%blit p=(list blit)] :: == :: -++ sign-gall :: - $% [%crud p=@tas q=(list tank)] :: - [%mean p=ares] :: - [%nice ~] :: - [%rush %dill-blit dill-blit] :: +++ sign-behn :: + $% [%onto p=(each suss tang)] :: + [%unto p=cuft] :: == :: ++ sign-time :: $% [%wake ~] :: == :: ++ sign :: in result $<- - $? [?(%a %c %e %f %g %t) %mass p=mass] :: $% [%a sign-ames] :: + [%b sign-behn] :: [%c sign-clay] :: [%d sign-dill] :: - [%g sign-gall] :: [%t sign-time] :: - == == :: + == :: :::::::: :: dill tiles -- =| all=axle @@ -235,7 +228,6 @@ %crud :: (send `dill-belt`[%cru p.kyz q.kyz]) (crud p.kyz q.kyz) %blew (send %rez p.p.kyz q.p.kyz) - %heft heft %veer (dump kyz) %vega (dump kyz) %verb (dump kyz) @@ -281,25 +273,14 @@ (dump %logo ~) (done %blit [bit ~]) :: - ++ heft - %_ . - moz - :* [hen %pass /heft/ames %a %wegh ~] - [hen %pass /heft/clay %c %wegh ~] - [hen %pass /heft/eyre %e %wegh ~] - [hen %pass /heft/ford %f %wegh ~] - [hen %pass /heft/gall %g %wegh ~] - [hen %pass /heft/time %t %wegh ~] - moz - == - == - :: ++ init :: initialize - ~& [%dill-init our] + ~& [%doll-init our] =+ myt=(flop (need tem)) =. tem ~ =. moz :_(moz [hen %pass / %c %font our %home our %base]) - =. moz :_(moz [hen %pass / %g %show [our [ram ~]] our ~]) + :: =. moz :_(moz [hen %pass / %g %show [our [ram ~]] our ~]) + =. moz :_(moz [hen %pass ~ %b %conf [[our ram] %load our %base]]) + =. moz :_(moz [hen %pass ~ %b %deal [our our] ram %peer ~]) |- ^+ +> ?~ myt +> $(myt t.myt, +> (send i.myt)) @@ -325,64 +306,19 @@ %_ +> moz :_ moz - [hen %pass ~ %g %mess [our [ram ~]] our [%dill-belt -:!>(bet) bet]] + [hen %pass ~ %b %deal [our our] ram %poke [%dill-belt -:!>(bet) bet]] == :: - ++ took :: send rush ack + ++ pump :: send diff ack %_ . moz - :_(moz [hen %pass ~ %g %took [our [ram ~]] our]) - == - :: - ++ wegh - ^- mass - :- %| - :~ ore/`ore.all - hey/`hey.all - dug/`dug.all - :: cor/`..as - == - :: - ++ wegt - |= [lal=?(%a %c %e %f %g %t) mas=mass] - ^+ +> - =. hef.all - ?- lal - %a ~?(?=(^ a.hef.all) %double-mass-a hef.all(a `mas)) - %c ~?(?=(^ c.hef.all) %double-mass-c hef.all(c `mas)) - %e ~?(?=(^ e.hef.all) %double-mass-e hef.all(e `mas)) - %f ~?(?=(^ f.hef.all) %double-mass-f hef.all(f `mas)) - %g ~?(?=(^ g.hef.all) %double-mass-g hef.all(g `mas)) - %t ~?(?=(^ t.hef.all) %double-mass-t hef.all(t `mas)) - == - ?. ?& ?=(^ a.hef.all) - ?=(^ c.hef.all) - ?=(^ e.hef.all) - ?=(^ f.hef.all) - ?=(^ g.hef.all) - ?=(^ t.hef.all) - == - +>.$ - %+ done(hef.all [~ ~ ~ ~ ~ ~]) - %mass - => [hef.all d=wegh] - :- %| - :~ ames/u.a - clay/u.c - dill/d - eyre/u.e - ford/u.f - gall/u.g - time/u.t + :_(moz [hen %pass ~ %b %deal [our our] ram %pump ~]) == :: ++ take :: receive - |= [tea=wire sih=sign] + |= sih=sign ^+ +> ?- sih - [?(%a %c %e %f %g %t) %mass *] - (wegt -.sih p.sih) - :: [%a %nice *] :: ~& [%take-nice-ames sih] +> @@ -390,15 +326,31 @@ [%a %init *] +>(moz :_(moz [hen %give +.sih])) :: - [%c %mere *] :: i don't think we get these anymore + [%c %mere *] ?: ?=(%& -.p.sih) +>.$ ~| %dill-mere-fail ~| p.p.p.sih |- ?~ q.p.p.sih !! - ~> %mean.|.(i.q.p.p.sih) :: interpolate ford fail into stack trace + ~> %mean.|.(i.q.p.p.sih) :: interpolate ford fail into stack trace $(q.p.p.sih t.q.p.p.sih) + :: + [%b %onto *] + :: ~& [%take-behn-onto +>.sih] + ?- -.+>.sih + %| (crud %onto p.p.+>.sih) + %& (done %blit [%lin (tuba "{}")]~) + == + :: + [%b %unto *] + :: ~& [%take-behn-unto +>.sih] + ?- -.+>.sih + %coup ?~(p.p.+>.sih +>.$ (crud %coup u.p.p.+>.sih)) + %quit !! :: ?? + %reap ?~(p.p.+>.sih +>.$ (crud %reap u.p.p.+>.sih)) + %diff pump:(from ((hard dill-blit) q:`vase`+>+>.sih)) + == :: [%c %note *] (from %out (tuba p.sih ' ' ~(ram re q.sih))) @@ -408,21 +360,6 @@ :: [%d %blit *] (done +.sih) - :: - [%g %crud *] - (crud p.+.sih q.+.sih) - :: (send %cru p.+.sih q.+.sih) - :: - [%g %mean *] - ~& %dill-take-mean - +> - :: - [%g %nice *] - :: ~& [%take-nice sih] - +> - :: - [%g %rush %dill-blit *] - took:(from +>+.sih) :: [%t %wake *] :: ~& %dill-wake @@ -486,8 +423,8 @@ [[p.q.hic %dojo] ~] ?: =(%earl myr) =+ fap=(sein p.q.hic) - [[fap %dojo] [fap %talk] ~] - [[p.q.hic %dojo] [p.q.hic %talk] ~] + [[fap %dojo] [fap %talk] [fap %helm] ~] + [[p.q.hic %dojo] [p.q.hic %talk] [p.q.hic %helm] ~] =^ moz all abet:(need (ax (need hey.all) [%flow %sole flo])) ?: |((lth p.q.hic 256) (gte p.q.hic (bex 64))) [moz ..^$] :: XX HORRIBLE [:_(moz [(need hey.all) %give %init p.q.hic]) ..^$] @@ -504,9 +441,7 @@ ~ :: ++ load :: trivial - |= old=?(old-axle axle) - ?: ?=(%2 -.old) - $(old [%3 ore hey dug ~ ~ ~ ~ ~ ~]:old) + |= old=axle ..^$(all old) :: |= old=* :: diable :: ..^$(ore.all `~zod) @@ -535,6 +470,8 @@ [~ ..^$] =+ our=?>(?=(^ ore.all) u.ore.all) =^ moz all - abet:(~(take as [~ hen our] (~(got by dug.all) hen)) tea q.hin) + abet:(~(take as [~ hen our] (~(got by dug.all) hen)) q.hin) [moz ..^$] -- + +:: good test diff --git a/base/arvo/doll.hoon b/base/arvo/doll.hoon index 53ff45f48..3d2649a7e 100644 --- a/base/arvo/doll.hoon +++ b/base/arvo/doll.hoon @@ -333,7 +333,7 @@ ~| p.p.p.sih |- ?~ q.p.p.sih !! - ~> %mean.|.(i.q.p.p.sih) :: interpolate ford fail into stack trace + ~> %mean.|.(i.q.p.p.sih) :: interpolate ford fail into stack trace $(q.p.p.sih t.q.p.p.sih) :: [%b %onto *] diff --git a/base/arvo/eyre.hoon b/base/arvo/eyre.hoon index dd9a84bcf..28bccb9d0 100644 --- a/base/arvo/eyre.hoon +++ b/base/arvo/eyre.hoon @@ -117,7 +117,7 @@ dop=(map host ship) :: host aliasing liz=(jug ,@uvH (each duct ixor)) :: ford depsets wup=(map hole cyst) :: secure sessions - sop=(map hole ,[ship ?]) :: foreign session names + sop=(map hole ,[ship ?]) :: foreign sess names wix=(map ixor stem) :: open views == :: ::