diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 8c89672527..9ce858b8c8 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1556,7 +1556,7 @@ :: =| $: fox/fort :: kernel state == :: - |= {now/@da eny/@ ski/sled} :: current invocation + |= {now/@da eny/@ ski/sley} :: current invocation ^? :: opaque core =< |% :: vane interface diff --git a/arvo/behn.hoon b/arvo/behn.hoon index ec8c702b65..d555a52d7a 100644 --- a/arvo/behn.hoon +++ b/arvo/behn.hoon @@ -149,7 +149,7 @@ =| $: $0 :: tym/{p/clok q/clok} :: positive+negative == :: -|= {now/@da eny/@ ski/sled} :: current invocation +|= {now/@da eny/@ ski/sley} :: current invocation ^? |% :: poke+peek pattern ++ call :: handle request diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 419001efb3..8b9be408a7 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -2574,7 +2574,7 @@ $: $0 :: vane version ruf/raft :: revision tree == :: -|= {now/@da eny/@ ski/sled} :: activate +|= {now/@da eny/@ ski/sley} :: activate ^? :: opaque core |% :: ++ call :: handle request diff --git a/arvo/dill.hoon b/arvo/dill.hoon index 4542ee1574..7b051c85d5 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -101,7 +101,7 @@ :::::::: :: dill tiles -- =| all/axle -|= {now/@da eny/@ ski/sled} :: current invocation +|= {now/@da eny/@ ski/sley} :: current invocation => |% ++ as :: per cause |_ $: {moz/(list move) hen/duct our/ship} diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 487a025fec..07d4e39dce 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -540,7 +540,7 @@ $: now/@da :: event date eny/@ :: unique entropy our/ship :: current ship - sky/$+(* (unit)) :: system namespace + sky/$+({* *} (unit)) :: system namespace == :: mow/(list move) :: pending actions == :: @@ -918,7 +918,7 @@ ^- @ta =+ pax=/(scot %p our)/code/(scot %da now)/(scot %p our) %^ rsh 3 1 - (scot %p (@ (need (sky %a pax)))) + (scot %p (@ (need (sky [151 %noun] %a pax)))) :: :: ++ handle @@ -1167,7 +1167,7 @@ =+ wir=`whir`[%ha (tope -.bem ~)] =. wir ?+(mef !! $post wir, $get wir, $head [%he wir]) ~| bad-beam+q.bem - ?< =([~ 0] (sky %cw (tope bem(+ ~, r [%da now])))) + ?< =([~ 0] (sky [%151 %noun] %cw (tope bem(+ ~, r [%da now])))) ?. aut [%& %boil [wir ext bem nquy]] [%| (ford-boil [wir ext bem nquy])] :: XX properly @@ -1564,7 +1564,7 @@ . == =| bolo =* bol - -|= {now/@da eny/@ ski/sled} :: activate +|= {now/@da eny/@ ski/sley} :: activate ^? :: opaque core |% :: ++ call :: handle request @@ -1592,8 +1592,8 @@ misc+[%& bol] == =+ our=`@p`0x100 :: XX sentinel - =+ ska=(slod ski) - =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) + =+ ska=(sloy ski) + =+ sky=|=({* *} `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) =. ney (shax :(mix (shax now) +(eny) ney)) :: XX!! shd not need ^+ [p=*(list move) q=..^$] =. gub ?.(=(`@`0 gub) gub (cat 3 (rsh 3 1 (scot %p (end 6 1 eny))) '-')) @@ -1632,8 +1632,8 @@ |= {tea/wire hen/duct hin/(hypo sign)} ^+ [p=*(list move) q=..^$] =+ our=`@p`0x100 :: XX sentinel - =+ ska=(slod ski) - =+ sky=|=(* `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) + =+ ska=(sloy ski) + =+ sky=|=({* *} `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) =. ney (shax :(mix (shax now) +(eny) ney)) :: XX!! shd not need ^+ [p=*(list move) q=..^$] =. gub ?.(=(`@`0 gub) gub (cat 3 (rsh 3 1 (scot %p (end 6 1 eny))) '-')) diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 7d7fe2e476..350b554bc4 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -166,10 +166,10 @@ sym=(cook crip ;~(plug low (star ;~(pose low nud)))) :: ++ norm :: normalize beam rev - |= {ska/sled bem/beam} + |= {ska/sley bem/beam} %_ bem r ?: ?=($ud -.r.bem) r.bem - =+ num=(ska ~ %cw bem(s ~)) + =+ num=(ska [%151 %noun] ~ %cw bem(s ~)) ?. ?=({$~ $~ * * @u} num) ~& norm-lost+(tope bem(s ~)) r.bem :: XX @@ -181,7 +181,7 @@ hen/duct :: event floor $: now/@da :: event date eny/@ :: unique entropy - ska/sled :: system namespace + ska/sley :: system namespace == :: mow/(list move) :: pending actions == :: @@ -1264,7 +1264,7 @@ ^- (bolt vase) %+ cope (mail cof p.vax gen) |= {cof/cafe typ/span fol/nock} - %+ (coup cof) (mecq [q.vax fol] (sloy syve)) + %+ (coup cof) (mock [q.vax fol] (sloy syve)) |=(val/* `vase`[typ val]) :: ++ make :: reduce silk @@ -1457,7 +1457,7 @@ ^- (bolt vase) %+ cope (malt cof p.gat p.sam) |= {cof/cafe typ/span} - %+ (coup cof) (mynq [q.gat q.sam] (sloy syve)) + %+ (coup cof) (mong [q.gat q.sam] (sloy syve)) |=(val/* `vase`[typ val]) :: ++ meow :: assemble @@ -1839,7 +1839,7 @@ =+ (~(get by keg) tem bem) ?^ - (some -) - (ska +<+.$) + (ska +<.$) -- -- :: @@ -1847,7 +1847,7 @@ . == =| axle =* lex - -|= {now/@da eny/@ ski/sled} :: activate +|= {now/@da eny/@ ski/sley} :: activate ^? :: opaque core ~% %ford-d ..is ~ |% :: diff --git a/arvo/gall.hoon b/arvo/gall.hoon index ae36f9b19c..de23ab9e0e 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -92,7 +92,7 @@ =| all/axle :: all vane state |= $: now/@da :: urban time eny/@uvI :: entropy - ska/sled :: activate + ska/sley :: activate == :: opaque core ~% %gall-top ..is ~ |% :::::::::::::::::::::::::::::::::::::::::::::::::::::: state machine @@ -1118,12 +1118,6 @@ [%| (ap-suck "invalid core")] [%& vax] :: - ++ ap-mong - ~/ %ap-mong - |= {{gat/* sam/*} sky/$+(* (unit))} - ^- toon - (mong [gat sam] sky) - :: ++ ap-slam :: virtual slam ~/ %ap-slam |= {cog/term gat/vase arg/vase} @@ -1135,14 +1129,14 @@ (slog >%ap-slam-mismatch< ~(duck ut p.arg) ~(duck ut sam) ~) :_(+>.$ [%| (ap-suck "call: {}: type mismatch")]) :_ +>.$(vel +>.wyz) - =+ ton=(ap-mong [q.gat q.arg] ap-sled) + =+ ton=(mong [q.gat q.arg] ap-sled) ?- -.ton $0 [%& +<.wyz p.ton] $1 [%| (turn p.ton |=(a/* (smyt (path a))))] $2 [%| p.ton] == :: - ++ ap-sled (mole (slod ska)) :: namespace view + ++ ap-sled (sloy ska) :: namespace view ++ ap-suck :: standard tang |= msg/tape ^- tang diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 5997b4d661..8eccc820b0 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -328,8 +328,7 @@ {$8 p/nock q/nock} :: push onto subject {$9 p/@ q/nock} :: select arm and fire {$10 p/$@(@ {p/@ q/nock}) q/nock} :: hint - {$11 p/nock} :: grab data from sky - {$12 p/nock q/nock} :: typed data from sky + {$11 p/nock q/nock} :: grab data from sky == :: ++ span $@ $? $noun :: any nouns $void :: no noun @@ -4534,23 +4533,12 @@ ++ mack |= {sub/* fol/*} ^- (unit) - =+ ton=(mink [sub fol] |~(* ~)) + =+ ton=(mink [sub fol] |=({* *} ~)) ?.(?=({$0 *} ton) ~ [~ p.ton]) :: -++ mick - ~/ %mick - |= {{sub/* fol/*} sea/$+({* *} (unit))} - (mink [sub fol] |=(* (sea [151 %noun] +<))) -:: -++ micq - ~/ %micq - |= {{sub/* fol/*} gul/$+({* *} (unit (unit)))} - ~& %soft-micq - (mick [sub fol] |=({* *} =+((gul +<) ?~(- ~ ?~(u.- ~ -))))) -:: ++ mink ~/ %mink - |= {{sub/* fol/*} sky/$+(* (unit))} + |= {{sub/* fol/*} gul/$+({* *} (unit (unit)))} =+ tax=*(list {@ta *}) |- ^- tone ?@ fol @@ -4615,26 +4603,18 @@ $(fol d.fol, tax [[b.fol p.ben] tax]) $(fol d.fol) :: - {$12 b/* c/*} + {$11 b/* c/*} =+ ref=$(fol b.fol) =+ ben=$(fol c.fol) ?. ?=($0 -.ref) ref ?. ?=($0 -.ben) ben - =+ val=(sky p.ben) - ?~(val [%1 p.ben ~] [%0 u.val]) + =+ val=(gul p.ref p.ben) + ?~(val [%1 p.ben ~] ?~(u.val !! [%0 u.u.val])) == :: ++ mock - |= {{sub/* fol/*} sky/$+(* (unit))} - (mook (mink [sub fol] sky)) -:: -++ meck - |= {{sub/* fol/*} sea/$+({* *} (unit))} - (mook (mick [sub fol] sea)) -:: -++ mecq |= {{sub/* fol/*} gul/$+({* *} (unit (unit)))} - (mook (micq [sub fol] gul)) + (mook (mink [sub fol] gul)) :: ++ moop |= pon/(list {@ta *}) ^+ pon @@ -4692,41 +4672,14 @@ leaf+"<[{(ud p.p)} {(ud q.p)}].[{(ud p.q)} {(ud q.q)}]>" == == :: -++ mang - |= {{gat/* sam/*} sky/$+(* (unit))} - ^- (unit) - =+ ton=(mong [[gat sam] sky]) - ?.(?=({$0 *} ton) ~ [~ p.ton]) -:: -++ myng - |= {{gat/* sam/*} sea/$+({* *} (unit))} - ^- toon - ?. &(?=(^ gat) ?=(^ +.gat)) - [%2 ~] - (meck [[-.gat [sam +>.gat]] -.gat] sea) -:: -++ mynq +++ mong |= {{gat/* sam/*} gul/$+({* *} (unit (unit)))} ^- toon ?. &(?=(^ gat) ?=(^ +.gat)) [%2 ~] - (mecq [[-.gat [sam +>.gat]] -.gat] gul) + (mock [[-.gat [sam +>.gat]] -.gat] gul) :: -++ mong - |= {{gat/* sam/*} sky/$+(* (unit))} - ^- toon - ?. &(?=(^ gat) ?=(^ +.gat)) - [%2 ~] - (mock [[-.gat [sam +>.gat]] -.gat] sky) -:: -++ mung - |= {{gat/* sam/*} sky/$+(* (unit))} - ^- tone - ?. &(?=(^ gat) ?=(^ +.gat)) - [%2 ~] - (mink [[-.gat [sam +>.gat]] -.gat] sky) -:: -++ mule :: spand virtual +++ mule :: typed virtual ~/ %mule |* taq/_|.(**) =+ mud=(mute taq) @@ -4735,10 +4688,10 @@ $| [%| p=p.mud] == :: -++ mute :: unspand virtual +++ mute :: untyped virtual |= taq/_^?(|.(**)) ^- (each * (list tank)) - =+ ton=(mock [taq 9 2 0 1] |=(* ~)) + =+ ton=(mock [taq 9 2 0 1] |=({* *} ~)) ?- -.ton $0 [%& p.ton] $1 [%| (turn p.ton |=(a/* (smyt (path a))))] @@ -6579,7 +6532,7 @@ (slap gat(+<.q sam) [%limb %$]) :: ++ slap - |= {vax/vase gen/twig} ^- vase :: unspand vase .* + |= {vax/vase gen/twig} ^- vase :: untyped vase .* =+ gun=(~(mint ut p.vax) %noun gen) [p.gun .*(q.vax q.gun)] :: @@ -8599,7 +8552,7 @@ {$ktpm *} =+(vat=$(gen p.gen) [(wrap(sut p.vat) %zinc) q.vat]) {$ktsg *} =+ nef=$(gen p.gen) - =+ moc=(mink [burn q.nef] |=(* ~)) + =+ moc=(mink [burn q.nef] |=({* *} ~)) [p.nef ?:(?=($0 -.moc) [%1 p.moc] q.nef)] :: {$ktts *} =+(vat=$(gen q.gen) [(conk(sut p.vat) p.gen) q.vat]) @@ -10408,15 +10361,10 @@ ++ pone (list {p/@tas q/vise}) :: kernel modules old ++ ship @p :: network identity ++ sink (trel bone ship path) :: subscription -++ sled $+ {(unit (set monk)) term beam} :: namespace function - (unit (unit cage)) :: ++ sley $+ {* (unit (set monk)) term beam} :: namespace function (unit (unit cage)) :: -++ slad $+ {(unit (set monk)) term beam} :: fully advanced - (unit (unit (cask))) :: ++ slyd $+ {* (unit (set monk)) term beam} :: super advanced (unit (unit (cask))) :: -++ slut $+(* (unit (unit))) :: old namespace ++ slyt $+({* *} (unit (unit))) :: old namespace ++ vile :: reflexive constants $: typ/span :: -:!>(*span) @@ -10425,31 +10373,6 @@ mev/span :: -:!>([%meta *vase]) == :: ++ wire path :: event pretext -::::: hacks and tools -++ slod - |= sed/slad - ^- slut - |= raw/* - =+ pux=((soft path) raw) - ?~ pux ~ - ?. ?=({@ @ @ @ *} u.pux) ~ - =+ :* hyr=(slay i.u.pux) - fal=(slay i.t.u.pux) - dyc=(slay i.t.t.u.pux) - ved=(slay i.t.t.t.u.pux) - tyl=t.t.t.t.u.pux - == - ?. ?=({$~ $$ $tas @} hyr) ~ - ?. ?=({$~ $$ $p @} fal) ~ - ?. ?=({$~ $$ $tas @} dyc) ~ - ?. ?=(^ ved) ~ - =+ ron=q.p.u.hyr - =+ bed=[[q.p.u.fal q.p.u.dyc (case p.u.ved)] (flop tyl)] - =+ bop=(sed ~ ron bed) - ?~ bop ~ - ?~ u.bop [~ ~] - [~ ~ +.q.u.u.bop] -:: ++ sloy |= sod/slyd ^- slyt @@ -10493,7 +10416,7 @@ +>.^$(q.sew (slam (slap syg [%limb %load]) (slap rig [%limb %stay]))) :: ++ wink :: deploy - |= {now/@da eny/@ ski/slad} + |= {now/@da eny/@ ski/slyd} =+ rig=(slym q.sew +<) :: activate vane ~% %wink +>+> ~ |% @@ -10718,8 +10641,8 @@ |= {vil/vile eny/@ bud/vase niz/(pair worm (list {p/@tas q/vase}))} |_ now/@da ++ beck - ^- slad - |= {fur/(unit (set monk)) ron/term bed/beam} + ^- slyd + |= {* fur/(unit (set monk)) ron/term bed/beam} ^- (unit (unit (cask))) => .(fur ?^(fur fur `[[%& p.bed] ~ ~])) :: XX heinous =+ lal=(end 3 1 ron) @@ -10921,7 +10844,7 @@ |= {now/@da hap/path} ^- (unit) ?~ hap [~ hoon] - =+ rob=((slod ~(beck (is vil eny bud niz) now)) hap) + =+ rob=((sloy ~(beck (is vil eny bud niz) now)) [151 %noun] hap) ?~ rob ~ ?~ u.rob ~ [~ u.u.rob]