diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 314824589..bc0da869f 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -424,7 +424,8 @@ [~ +>.$] =+ rad=(~(get by hoc.saf) her) ?^ rad - ?> ?=(^ lew.wod.u.rad) + ?. ?=(^ lew.wod.u.rad) + $(hoc.saf (~(del by hoc.saf) her)) :: XX how can this be? ?. =(pub r.q.i.lew.wod.u.rad) [~ +>.$] [[~ lew.wod.u.rad] +>.$] =+ syp=[[0 [~ p.nes] her now] ges pub] @@ -1466,7 +1467,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] - ^- (unit (unit)) + ^- (unit (unit (pair lode ,*))) ?~ tyl [~ ~] =+ hun=(slaw %p i.tyl) ?~ hun [~ ~] @@ -1476,11 +1477,15 @@ ?. =(0 ren) ~ ?+ lot ~ [%$ %ud @] - (perm who u.hun q.p.lot [syd t.tyl]) + %+ bind + (perm who u.hun q.p.lot [syd t.tyl]) + |=(a=* [%noun a]) :: [%$ %da @] ?. =(now q.p.lot) ~ - (temp who u.hun [syd t.tyl]) + %+ bind + (temp who u.hun [syd t.tyl]) + |=(a=* [%noun a]) == :: ++ stay fox @@ -1656,6 +1661,9 @@ =+ fod=(~(get by hoc.saf.u.gys) his) ?~ fod ~ (rick mar his lew.wod.u.fod) + ?: ?=([%tick ~] tyl) + ?. =(our (sein his)) ~ + [~ (end 6 1 (shaf %tick (mix his (shax sec:ex:q:sen:u.gys))))] ~ ?: ?=([%buck ~] tyl) =+ muc=(rice mar sex:u.gys) @@ -1664,11 +1672,6 @@ [~ `buck`[u.muc u.luw]] ?: ?=([%code ~] tyl) [~ (end 6 1 (shaf %code (shax sec:ex:q:sen:u.gys)))] - ?: ?=([%tick @ ~] tyl) - =+ hur=(slaw %p i.t.tyl) - ?~ hur ~ - ?. =(our (sein u.hur)) ~ - [~ (end 6 1 (shaf %tick (mix u.hur (shax sec:ex:q:sen:u.gys))))] ?: ?=([%will ~] tyl) (rick mar our law.saf.u.gys) ~ diff --git a/arvo/batz.hoon b/arvo/batz.hoon index f2a7a91db..60b7274d7 100644 --- a/arvo/batz.hoon +++ b/arvo/batz.hoon @@ -1279,7 +1279,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] - ^- (unit (unit)) + ^- (unit (unit (pair lode ,*))) ~ :: ++ stay [%0 big dez] diff --git a/arvo/clay.hoon b/arvo/clay.hoon index 3c5ef2587..3577c6d60 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -437,7 +437,7 @@ :: ++ scry :: inspect |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] - ^- (unit (unit)) + ^- (unit (unit (pair lode ,*))) =+ got=(~(has by fat.ruf) his) =+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot)) ?~ luk [~ ~] @@ -446,9 +446,10 @@ [~ ~] =+ run=((soft care) ren) ?~ run [~ ~] - %. [u.run u.luk tyl] - =+ dud=?.(got (do now [his his] syd ruf) (di:une syd)) - aver:dud + %+ bind + %. [u.run u.luk tyl] + aver:?.(got (do now [his his] syd ruf) (di:une syd)) + |=(a=(unit) (bind a |=(b=* [%noun b]))) :: ++ stay [%0 ruf] -- diff --git a/arvo/dill.hoon b/arvo/dill.hoon index 2daa93aa1..512109c48 100644 --- a/arvo/dill.hoon +++ b/arvo/dill.hoon @@ -451,7 +451,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] - ^- (unit (unit)) + ^- (unit (unit (pair lode ,*))) ~ :: ++ stay [%0 dug] diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index f68a27cad..98f179b1d 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1718,7 +1718,7 @@ :: %fun :- [~ pip(pez %way)] - =+ bem=`beam`(need (tome q.som.pip)) + =+ bem=`bead`(need (tome q.som.pip)) =+ bek=`beak`[p.bem q.bem r.bem] =+ kas=`silk`[%cast %mime bek `silk`[%boil p.som.pip bem]] +>.$(..ya (honk our num ses kas)) @@ -1866,7 +1866,7 @@ :: ++ scry |= [our=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] - ^- (unit (unit)) + ^- (unit (unit (pair lode ,*))) ~ :: ++ stay `bolo`+>-.$ diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 664dc9b85..e068a139b 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -17,8 +17,8 @@ |* a=$+(* *) :: product clam $: p=cafe :: cache $= q :: - $% [%0 p=(set beam) q=a] :: depends/product - [%1 p=(set ,[p=beam q=(list tank)])] :: blocks + $% [%0 p=(set bead) q=a] :: depends/product + [%1 p=(set ,[p=bead q=(list tank)])] :: blocks [%2 p=(list tank)] :: error == :: == :: @@ -34,7 +34,7 @@ :: :: ++ calm :: cache metadata $: laz=@da :: last accessed - dep=(set beam) :: dependencies + dep=(set bead) :: dependencies == :: ++ calx :: concrete cache line $% [%comp p=calm q=cage r=twig] :: compile by text @@ -43,7 +43,7 @@ ++ task :: problem in progress $: nah=duct :: cause kas=silk :: problem - kig=[p=@ud q=(map ,@ud beam)] :: blocks + kig=[p=@ud q=(map ,@ud bead)] :: blocks == :: -- :: |% :: @@ -85,7 +85,7 @@ == :: ++ fine |* [a=cafe b=*] :: bolt from data - [p=`cafe`a q=[%0 p=*(set beam) q=b]] :: + [p=`cafe`a q=[%0 p=*(set bead) q=b]] :: ++ flaw |=([a=cafe b=(list tank)] [p=a q=[%2 p=b]]) :: bolt from error :: ++ grom :: merge sets @@ -147,7 +147,7 @@ ++ amok %_(..zo q.tad.bay (~(del by q.tad.bay) num)) ++ camo :: stop requests ^+ . - =+ kiz=(~(tap by q.kig) *(list ,[p=@ud q=beam])) + =+ kiz=(~(tap by q.kig) *(list ,[p=@ud q=bead])) |- ^+ +> ?~ kiz +> %= $ @@ -160,7 +160,7 @@ == :: ++ camp :: request a file - |= [ren=care bem=beam] + |= [ren=care bem=bead] ^+ +> =+ tik=(scot %ud p.kig) =: p.kig +(p.kig) @@ -240,13 +240,13 @@ ^= q ?- -.ton %2 [%2 p=p.ton] - %0 [%0 p=*(set beam) q=(fun p.ton)] + %0 [%0 p=*(set bead) q=(fun p.ton)] %1 =- ?- faw - & [%1 p=(turn p.faw |=(a=beam [a *(list tank)]))] + & [%1 p=(turn p.faw |=(a=bead [a *(list tank)]))] | [%2 p=p.faw] == ^= faw - |- ^- (each (list beam) (list tank)) + |- ^- (each (list bead) (list tank)) ?~ p.ton [%& ~] =+ nex=$(p.ton t.p.ton) =+ pax=(path i.p.ton) @@ -277,7 +277,7 @@ =< abet |- ^+ ..exec ?~ zuk ..exec - =+ foo=`_..exec`(camp %x `beam`p.i.zuk) + =+ foo=`_..exec`(camp %x `bead`p.i.zuk) $(zuk t.zuk, ..exec foo) == :: @@ -342,7 +342,7 @@ (fine cof p.cay vax) :: ++ krab :: load to twig - |= [cof=cafe for=logo how=logo rem=spur bem=beam] + |= [cof=cafe for=logo how=logo rem=spur bem=bead] ^- (bolt vase) %+ cope (fade cof %bake how bem) |= [cof=cafe gen=twig] @@ -351,7 +351,7 @@ (maul cof gat !>([`beak`[p.bem q.bem r.bem] for +:s.bem rem])) :: ++ lace :: load and check - |= [cof=cafe for=logo rem=spur bem=beam] + |= [cof=cafe for=logo rem=spur bem=bead] ^- (bolt (unit vase)) =+ bek=`beak`[p.bem q.bem r.bem] %+ cope (lend cof bem) @@ -375,7 +375,7 @@ ^- (bolt (unit vase)) ?: ?=(?(%gate %core %hoon %hook) for) (fine cof ~ sam) - %+ cope (make cof %boil %gate p.bek q.bek r.bek /ref/[for]/sys) + %+ cope (make cof %boil %gate bek /ref/[for]/sys) |= [cof=cafe cay=cage] %+ cope (lane cof p.q.cay [%cnzy %$]) |= [cof=cafe ref=type] @@ -386,7 +386,7 @@ (fine cof ~ pro) :: ++ lair :: metaload - |= [for=logo bem=beam] + |= [for=logo bem=bead] |= [cof=cafe vax=vase] ^- (bolt vase) ?. (~(nest ut -:!>(*silk)) | p.vax) @@ -402,14 +402,14 @@ |=(ref=type ref) :: ++ lend :: load arch - |= [cof=cafe bem=beam] + |= [cof=cafe bem=bead] ^- (bolt arch) =+ von=(ska %cy (tope bem)) ?~ von [p=cof q=[%1 [bem ~] ~ ~]] (fine cof ((hard arch) (need u.von))) :: ++ liar :: load vase - |= [cof=cafe bem=beam] + |= [cof=cafe bem=bead] ^- (bolt vase) =+ von=(ska %cx (tope bem)) ?~ von @@ -422,14 +422,14 @@ |= [cof=cafe for=logo bek=beak] ^- (bolt (list ,@tas)) %+ cope - %+ cope (lend cof p.bek q.bek r.bek `path`~[%tan for %sys]) + %+ cope (lend cof bek `path`~[%tan for %sys]) |= [cof=cafe arc=arch] (fine cof (turn (~(tap by r.arc) ~) |=([a=@tas b=~] a))) |= [cof=cafe all=(list ,@tas)] (fine cof ?.(=(%hoon for) all [%hoot all])) :: ++ lima :: load at depth - |= [cof=cafe for=logo rem=spur bem=beam] + |= [cof=cafe for=logo rem=spur bem=bead] ^- (bolt (unit vase)) %+ cope (lend cof bem) |= [cof=cafe arc=arch] @@ -451,8 +451,8 @@ |= [cof=cafe vax=vase] (fine cof ~ vax) :: - ++ lime :: load beam - |= [cof=cafe for=logo bem=beam] + ++ lime :: load bead + |= [cof=cafe for=logo bem=bead] =+ [mob=bem rem=*path] |- ^- (bolt vase) %+ cope (lima cof for rem bem) @@ -468,7 +468,7 @@ ?: =(too for) (fine cof vax) ?: &(=(%hoot too) =(%hoon for)) (fine cof !>(ream)) - %+ cope (make cof %boil %gate p.bek q.bek r.bek /[too]/tan/[for]/sys) + %+ cope (make cof %boil %gate bek /[too]/tan/[for]/sys) |= [cof=cafe cay=cage] (maul cof q.cay vax) :: @@ -651,7 +651,7 @@ :: ++ scry |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] - ^- (unit (unit)) + ^- (unit (unit (pair lode ,*))) ~ :: ++ stay `axle`+>-.$ diff --git a/arvo/gall.hoon b/arvo/gall.hoon index d38ba4e62..b47e8dfe7 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -164,7 +164,7 @@ lot=coin tyl=path == - ^- (unit (unit)) + ^- (unit (unit (pair lode ,*))) =+ ^= vew ^- lens :: XX future scry %. :- use :- [who syd ((hard case) p.lot)] @@ -173,14 +173,16 @@ bid=bead :: position == :: (beef:(gaur p.bid q.bid) use r.bid s.bid) - ?+ ren ~ - %u u.vew - %v v.vew - %w w.vew - %x x.vew - %y y.vew - %z z.vew - == + %+ bind + ?+ ren ~ + %u u.vew + %v v.vew + %w w.vew + %x x.vew + %y y.vew + %z z.vew + == + |=(a=(unit) (bind a |=(b=* [%noun b]))) :: ++ doze |= [now=@da hen=duct] @@ -358,7 +360,7 @@ %_(+>.$ ped.sat pen, mow :(weld new old mow)) :: ++ drum :: raw dependencies - |= dep=(set beam) + |= dep=(set bead) ^+ +> ?> ?=(^ orm.sat) %- drug @@ -395,7 +397,7 @@ ++ home :: load application ^- silk :+ %boil %core - [our %main [%da now] %app ~] + [[our %main [%da now]] %app ~] :: ++ more :: accept result |= $: pax=path :: internal position diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 06d8f60a6..9453d5872 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -9019,7 +9019,7 @@ ren=care bed=bead == - ^- (unit (unit)) + ^- (unit (unit cage)) =+ ^= old :* fur ren @@ -9028,9 +9028,12 @@ `coin`[%$ r.bed] (flop s.bed) == - ^- (unit (unit)) + ^- (unit (unit cage)) =+ pro=(slym (slap rig [%cnzy %scry]) old) - ((hard (unit (unit))) q.pro) + ?~ q.pro ~ + ?~ +.q.pro [~ ~] + =+ dat=(slot 7 pro) + [~ ~ (lode q.dat) (slot 3 dat)] :: ++ soar :: postprocess vane |= sev=vase @@ -9080,12 +9083,8 @@ |- ^- (unit (unit cage)) ?~ fan ~ ?. =(dis p.i.fan) $(fan t.fan) - =+ ^= bop - %- scry:(wink:(vent vil bud q.i.fan) now (shax now) ..^$) - [fur ren bed] - ?~ bop ~ - ?~ u.bop [~ ~] - [~ ~ [%$ %noun u.u.bop]] + %- scry:(wink:(vent vil bud q.i.fan) now (shax now) ..^$) + [fur ren bed] :: ++ dink :: vase by char |= din=@tas ^- vase diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 7b605b32f..dc0adf7d2 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -1945,7 +1945,7 @@ :: ++ tome :: parse path |= pax=path - ^- (unit beam) + ^- (unit bead) ?. ?=([* * * *] pax) ~ %+ biff (slaw %p i.pax) |= who=ship @@ -1954,10 +1954,10 @@ %+ biff (slay i.t.t.pax) |= cis=coin ?. ?=([%$ case] cis) ~ - `(unit beam)`[~ who dex `case`p.cis (flop t.t.t.pax)] + `(unit bead)`[~ [who dex `case`p.cis] (flop t.t.t.pax)] :: -++ tope :: beam to path - |= bem=beam +++ tope :: bead to path + |= bem=bead ^- path [(scot %p p.bem) q.bem (scot r.bem) (flop s.bem)] :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -2018,14 +2018,13 @@ == :: ++ beau ,[p=(unit ,@ud) q=(map wire goal) r=boor] :: next/want/thread ++ beak ,[p=ship q=desk r=case] :: garnish with beak -++ beam ,[p=ship q=desk r=case s=spur] :: spur is flopped ++ 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 beam) q=cage] :: computed result +++ beet ,[p=(set bead) q=cage] :: computed result ++ bird :: packet in travel $: gom=soap :: message identity mup=@ud :: pktno in msg @@ -2582,11 +2581,11 @@ == :: ++ silk :: construction layer $& [p=silk q=silk] :: cons - $% [%bake p=logo q=beam] :: local synthesis - [%boil p=logo q=beam] :: general synthesis + $% [%bake p=logo q=bead] :: local synthesis + [%boil p=logo q=bead] :: general synthesis [%call p=silk q=silk] :: slam [%cast p=logo q=beak r=silk] :: translate - [%done p=(set beam) q=cage] :: literal + [%done p=(set bead) q=cage] :: literal [%mute p=silk q=(list (pair wing silk))] :: mutant [%pass p=silk q=sill] :: twig construction [%reef ~] :: kernel reef @@ -2594,7 +2593,7 @@ ++ sill :: code construction $% [%0 p=@] :: direct text [%1 p=twig] :: direct twig - [%2 p=beam] :: beam over %hoon + [%2 p=bead] :: bead over %hoon [%3 p=silk] :: build a %hoot == :: ++ skit ,[p=(unit ,@ta) q=(list ,@ta) r=(list ,@ta)] :: tracking path