diff --git a/sys/arvo.hoon b/sys/arvo.hoon index 96a907fd0..487b07e57 100644 --- a/sys/arvo.hoon +++ b/sys/arvo.hoon @@ -331,8 +331,8 @@ ~& [%swim-lost lal (symp +>-.hil)] [~ [vase.vane worm.vane]] =^ pro worm.vane (need pru) - =^ moz worm.vane (~(slap wa worm.vane) pro [%limb %p]) - =^ vem worm.vane (~(slap wa worm.vane) pro [%limb %q]) + =^ moz worm.vane (~(slot wa worm.vane) 2 pro) + =^ vem worm.vane (~(slot wa worm.vane) 3 pro) =^ sad worm.vane (said moz) [sad [(soar vem) worm.vane]] -- diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index cc376b03e..5cf6389d0 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -1238,7 +1238,7 @@ ~& [%ames-call-flub (@tas `*`-.q.hic)] ((hard task:able) q.hic) == - ^- [p=(list move) q=_..^$] + ^- [(list move) _..^$] =^ duy ..knob (knob hen q.hic) [duy ..^$] @@ -1263,7 +1263,7 @@ ++ stay fox ++ take :: accept response |= [tea=wire hen=duct hin=(hypo sign:able)] - ^- [p=(list move) q=_..^$] + ^- [(list move) _..^$] =^ duy ..knap (knap tea hen q.hin) [duy ..^$] diff --git a/sys/vane/behn.hoon b/sys/vane/behn.hoon index 7ba2e203c..d5561a9b3 100644 --- a/sys/vane/behn.hoon +++ b/sys/vane/behn.hoon @@ -166,7 +166,7 @@ ((hard task:able) q.hic) == =* req q.hic - |- ^- [p=(list move) q=_..^^$] + |- ^- [(list move) _..^^$] :: ?: ?=(%born -.req) =. gad hen @@ -245,6 +245,6 @@ ++ stay state ++ take :: process move |= {tea/wire hen/duct hin/(hypo sign)} - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] !! -- diff --git a/sys/vane/clay.hoon b/sys/vane/clay.hoon index 4d7343378..d92c13dc1 100644 --- a/sys/vane/clay.hoon +++ b/sys/vane/clay.hoon @@ -3719,7 +3719,7 @@ ~& [%clay-call-flub (@tas `*`-.req)] ((hard task:able) req) == - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] ?- -.req $boat :_ ..^$ @@ -4075,7 +4075,7 @@ ++ stay [%1 ruf] ++ take :: accept response |= {tea/wire hen/duct hin/(hypo sign)} - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] ?: ?=({$merge @ @ @ @ @ ~} tea) ?> ?=(?($writ $made) +<.q.hin) =+ our=(slav %p i.t.tea) diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index 08a764065..7da4c6aa6 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -495,7 +495,7 @@ |= $: hen/duct hic/(hypo (hobo task:able)) == - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] => %= . :: XX temporary q.hic ^- task:able @@ -576,7 +576,7 @@ :: ++ take :: process move |= {tea/wire hen/duct hin/(hypo sign)} - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] =/ nus (ax hen) ?~ nus :: we got this on an unknown duct or diff --git a/sys/vane/eyre.hoon b/sys/vane/eyre.hoon index 83bffd0fc..9123a6365 100644 --- a/sys/vane/eyre.hoon +++ b/sys/vane/eyre.hoon @@ -2257,7 +2257,7 @@ ~& [%eyre-call-flub (@tas `*`-.q.hic)] ((hard task:able) q.hic) == - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] ?: ?=($wegh -.q.hic) :_ ..^$ :_ ~ :^ hen %give %mass @@ -2321,7 +2321,7 @@ ++ stay `bolo`+>-.$ ++ take :: accept response |= {tea/wire hen/duct hin/(hypo sign)} - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] =+ our=`@p`0x100 :: XX sentinel =+ ska=(sloy ski) =+ sky=|=({* *} `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a])))) diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon index 8877cebd7..4b3dde395 100644 --- a/sys/vane/ford.hoon +++ b/sys/vane/ford.hoon @@ -6095,7 +6095,7 @@ :: ++ call |= [=duct type=* wrapped-task=(hobo task:able)] - ^- [p=(list move) q=_ford-gate] + ^- [(list move) _ford-gate] :: unwrap :task from :wrapped-task :: =/ task=task:able @@ -6226,7 +6226,7 @@ :: ++ take |= [=wire =duct wrapped-sign=(hypo sign)] - ^- [p=(list move) q=_ford-gate] + ^- [(list move) _ford-gate] :: unwrap :sign, ignoring unneeded +type in :p.wrapped-sign :: =/ =sign q.wrapped-sign @@ -6244,7 +6244,7 @@ ~| [%take-our our] (~(got by state-by-ship.ax) our) :: - |^ ^- [p=(list move) q=_ford-gate] + |^ ^- [(list move) _ford-gate] :: =^ moves ship-state ?+ i.t.wire ~|([%bad-take-wire wire] !!) diff --git a/sys/vane/gall.hoon b/sys/vane/gall.hoon index 0d7c6375c..b8e5bc5ff 100644 --- a/sys/vane/gall.hoon +++ b/sys/vane/gall.hoon @@ -1302,7 +1302,7 @@ ++ call :: request ~% %gall-call +> ~ |= {hen/duct hic/(hypo (hobo task:able))} - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] => .(q.hic ?.(?=($soft -.q.hic) q.hic ((hard task:able) p.q.hic))) ?- -.q.hic $conf @@ -1392,7 +1392,7 @@ ++ take :: response ~/ %gall-take |= {tea/wire hen/duct hin/(hypo sign-arvo)} - ^+ [p=*(list move) q=..^$] + ^+ [*(list move) ..^$] ~| [%gall-take tea] ?> ?=({@ ?($sys $use) *} tea) =+ our=(need (slaw %p i.tea)) diff --git a/sys/vane/jael.hoon b/sys/vane/jael.hoon index 2ae746845..8e1e20266 100644 --- a/sys/vane/jael.hoon +++ b/sys/vane/jael.hoon @@ -2200,7 +2200,7 @@ hen/duct hic/(hypo (hobo task:able)) == - ^- {p/(list move) q/_..^$} + ^- [(list move) _..^$] =^ did lex =- abet:(~(call of [now eny] lex) hen -) ?. ?=($soft -.q.hic) q.hic @@ -2385,7 +2385,7 @@ hen/duct hin/(hypo sign) == - ^- {p/(list move) q/_..^$} + ^- [(list move) _..^$] =^ did lex abet:(~(take of [now eny] lex) tea hen q.hin) [did ..^$] --