diff --git a/app/dojo.hoon b/app/dojo.hoon index 16755e08b..098ab712b 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -1214,7 +1214,7 @@ $get /scar == =+ gat=(slot 3 q.cay) - :+ %call (dy-silk-vase gat) + :+ %cnhp (dy-silk-vase gat) :+ (dy-silk-vase !>([now=now.hid eny=eny.hid bec=he-beak])) (dy-silk-sources p.cig) :+ %mute (dy-silk-vase (fall (slew 27 gat) !>(~))) @@ -1316,7 +1316,7 @@ $dv [/hand [%core he-beak (flop p.bil)]] $ex [/hand (dy-mare p.bil)] $as [/hand [%cast p.bil [%$ (dy-cage p.q.bil)]]] - $do [/hand [%call (dy-mare p.bil) [%$ (dy-cage p.q.bil)]]] + $do [/hand [%cnhp (dy-mare p.bil) [%$ (dy-cage p.q.bil)]]] $tu :- /hand :- %$ :- %noun diff --git a/neo/arvo.hoon b/neo/arvo.hoon index 34377353d..7a50ec129 100644 --- a/neo/arvo.hoon +++ b/neo/arvo.hoon @@ -582,7 +582,7 @@ hil/mill == ^+ ..va - =^ nex sac.hax (~(call wa sac.hax) fox %call hil) + =^ nex sac.hax (~(call wa sac.hax) fox %cnhp hil) abet(fox nex) :: :: ++take:spin:va-plow: ++ take :: pass backward diff --git a/neo/hoon.hoon b/neo/hoon.hoon index 174f986bd..947b9164a 100644 --- a/neo/hoon.hoon +++ b/neo/hoon.hoon @@ -5446,7 +5446,7 @@ :: :::::: invocations {$cncb p/wing q/(list (pair wing twig))} :: %_ {$cndt p/twig q/twig} :: %. - {$call p/twig q/(list twig)} :: %- + {$cnhp p/twig q/(list twig)} :: %- {$cntr p/wing q/twig r/(list (pair wing twig))} :: %* {$cnkt p/twig q/twig r/twig s/twig} :: %^ {$cnls p/twig q/twig r/twig} :: %+ @@ -6078,7 +6078,7 @@ =. wat ~ =+ cys=~(boil ap p.sec) ?: ?=($herb -.cys) - [%call (home p.sec) [%$ axe] ~] + [%cnhp (home p.sec) [%$ axe] ~] $(sec cys) :: {$kelp *} @@ -6428,9 +6428,9 @@ :: {$leaf *} ~(clam al boil) {$limb *} [%make [p.gen ~] ~] - {$tell *} [%call [%limb %noah] [%wrap [%cltr p.gen]] ~] + {$tell *} [%cnhp [%limb %noah] [%wrap [%cltr p.gen]] ~] {$wing *} [%make p.gen ~] - {$yell *} [%call [%limb %cain] [%wrap [%cltr p.gen]] ~] + {$yell *} [%cnhp [%limb %cain] [%wrap [%cltr p.gen]] ~] :: {$bcpt *} ~(clam al boil) {$bccb *} ~(clam al boil) @@ -6485,10 +6485,10 @@ :: {$bunt *} [%burn ~(bunt al %herb p.gen)] {$cncb *} [%like [%wing p.gen] %make p.gen q.gen] - {$cndt *} [%call q.gen [p.gen ~]] - {$cnkt *} [%call p.gen q.gen r.gen s.gen ~] - {$cnls *} [%call p.gen q.gen r.gen ~] - {$call *} [%open [%$ ~] p.gen q.gen] + {$cndt *} [%cnhp q.gen [p.gen ~]] + {$cnkt *} [%cnhp p.gen q.gen r.gen s.gen ~] + {$cnls *} [%cnhp p.gen q.gen r.gen ~] + {$cnhp *} [%open [%$ ~] p.gen q.gen] {$open *} :: [%cntr p.gen q.gen (hail(gen [%cltr r.gen]) 6)] :^ %cntr p.gen q.gen :: @@ -6512,14 +6512,14 @@ (weld p.gen `wing`[[%& 2] ~]) (turn r.gen |=({p/wing q/twig} [p [%per [%$ 3] q]])) :: - {$ward *} [%like [%call p.gen q.gen ~] q.gen] + {$ward *} [%like [%cnhp p.gen q.gen ~] q.gen] {$cast *} [%like ~(bunt al [%herb p.gen]) q.gen] {$show *} :+ %hint :- %mean =+ fek=~(feck ap p.gen) ?^ fek [%rock %tas u.fek] - [%brdt [~ ~] [%call [%limb %cain] [%wrap [%per [%$ 3] p.gen]] ~]] + [%brdt [~ ~] [%cnhp [%limb %cain] [%wrap [%per [%$ 3] p.gen]] ~]] q.gen :: {$lurk *} [%hint [%mean [%brdt [~ ~] p.gen]] q.gen] @@ -6543,7 +6543,7 @@ {$memo *} [%hint [%memo %rock %$ p.gen] q.gen] {$dump *} :+ %hint - [%slog [%sand %$ p.gen] [%call [%limb %cain] [%wrap q.gen] ~]] + [%slog [%sand %$ p.gen] [%cnhp [%limb %cain] [%wrap q.gen] ~]] r.gen :: {$ddup *} [%hint [%germ p.gen] q.gen] @@ -6564,7 +6564,7 @@ |- ^- twig ?- yex {* $~} [%per [%$ 3] i.yex] - {* ^} [%call [%$ 2] [%per [%$ 3] i.yex] $(yex t.yex) ~] + {* ^} [%cnhp [%$ 2] [%per [%$ 3] i.yex] $(yex t.yex) ~] $~ !! == == @@ -6590,7 +6590,7 @@ :+ %brdt [~ ~] :: |. :^ %cnls :: %+ [%per [%limb %v] p.gen] :: =>(v {p.gen}) - [%call [%limb %b] [%limb %c] ~] :: (b c) + [%cnhp [%limb %b] [%limb %c] ~] :: (b c) :+ %make [%a ~] :: a(,.+6 c) [[[[%| 0 ~] [%& 6] ~] [%limb %c]] ~] :: == :: @@ -6601,7 +6601,7 @@ [%per [%limb %v] p.gen] :: =>(v {p.gen}) :+ %pin [%name %b [%per [%limb %v] q.gen]] :: =+ b==>(v {q.gen}) :+ %pin :: =+ c=(a b) - [%name %c [%call [%limb %a] [%limb %b] ~]] :: + [%name %c [%cnhp [%limb %a] [%limb %b] ~]] :: :+ %sure :: ?>(=(`*`c `*`b) c) :+ %same :: [%cast [%base %noun] [%limb %c]] :: @@ -6678,7 +6678,7 @@ {$ifno *} [%if [%fits [%base %null] p.gen] q.gen r.gen] {$not *} [%if p.gen [%rock %f 1] [%rock %f 0]] {$wrap *} - [%call [%limb %onan] [%spit [%bunt [%limb %abel]] p.gen] ~] + [%cnhp [%limb %onan] [%spit [%bunt [%limb %abel]] p.gen] ~] :: {$need *} ?: ?: ?=(@ p.gen) @@ -6774,7 +6774,7 @@ $cltr (lead -.gen %.(+.gen moar)) $cncb (lead -.gen %.(+.gen (twin noop moan))) $cndt (lead -.gen %.(+.gen dubs)) - $call (lead -.gen %.(+.gen (twin expr moar))) + $cnhp (lead -.gen %.(+.gen (twin expr moar))) $cntr (lead -.gen %.(+.gen (trio noop expr moan))) $cnkt (lead -.gen %.(+.gen (quad expr expr expr expr))) $cnls (lead -.gen %.(+.gen trey)) @@ -7889,7 +7889,7 @@ =+ vat=$(gen p.gen) %= $ gen - :- [%call [%limb %onan] [%hand p:!>(*span) [%1 p.vat]] ~] + :- [%cnhp [%limb %onan] [%hand p:!>(*span) [%1 p.vat]] ~] [%hand p.vat q.vat] == :: @@ -8314,7 +8314,7 @@ {$twig *} (play p.gen) {$wrap *} %= $ gen - [%call [%limb %onan] [%hand p:!>(*span) [%1 $(gen p.gen)]] ~] + [%cnhp [%limb %onan] [%hand p:!>(*span) [%1 $(gen p.gen)]] ~] == {$lost *} %void {$spit *} (cell $(gen p.gen) $(gen q.gen)) @@ -8993,7 +8993,7 @@ ++ glam ~+((glue ace)) ++ hasp ;~ pose (ifix [sel ser] wide) - (stag %call (ifix [pel per] (most ace wide))) + (stag %cnhp (ifix [pel per] (most ace wide))) (stag %sand (stag %t qut)) %+ cook |=(a/coin [%sand ?:(?=({$~ $tas *} a) %tas %ta) ~(rent co a)]) @@ -9474,7 +9474,7 @@ :^ %ifno sug [%make sug [[[[%& 1] ~] [%$ 13]] ~]] [%make sug [[[[%& 3] ~] [%make [%$ ~] [[sug [%$ 25]] ~]]] ~]] - $d [[%call p.i.lut [%cltr $(lut t.lut)] ~] ~] + $d [[%cnhp p.i.lut [%cltr $(lut t.lut)] ~] ~] $e [[p.i.lut ^$(lut [[%f q.i.lut] ~])] $(lut t.lut)] $f $(lut (weld p.i.lut t.lut)) == @@ -9521,7 +9521,7 @@ == :- '(' %+ stag %bcsm - %+ stag %call + %+ stag %cnhp %+ ifix [pel per] ;~(plug wide ;~(pose ;~(pfix ace (most ace wyde)) (easy ~))) :- '{' @@ -9603,7 +9603,7 @@ :- '\'' (stag %sand (stag %t qut)) :- '(' - (stag %call (ifix [pel per] (most ace wide))) + (stag %cnhp (ifix [pel per] (most ace wide))) :- '{' (stag %bccl (ifix [kel ker] (most ace wide))) :- '*' @@ -9770,8 +9770,8 @@ ^. stet ^. limo :~ ['^' (rune ket %cnkt exqy)] ['+' (rune lus %cnls exqx)] - ['-' (rune hep %call exqk)] - [':' (rune col %call exqz)] + ['-' (rune hep %cnhp exqk)] + [':' (rune col %cnhp exqz)] == == == @@ -9816,8 +9816,8 @@ ['.' (rune dot %cndt expb)] ['^' (rune ket %cnkt expd)] ['+' (rune lus %cnls expc)] - ['-' (rune hep %call expk)] - [':' (rune col %call expi)] + ['-' (rune hep %cnhp expk)] + [':' (rune col %cnhp expi)] ['~' (rune sig %open expu)] ['*' (rune tar %cntr expm)] ['=' (rune tis %make exph)] @@ -9862,7 +9862,7 @@ (word %cndt expb) (word %cnkt expd) (word %cnls expc) - (word %call expk) + (word %cnhp expk) (word %open expu) (word %cntr expm) (word %make exph) diff --git a/neo/lull.hoon b/neo/lull.hoon index 6f210a236..41f068a4a 100644 --- a/neo/lull.hoon +++ b/neo/lull.hoon @@ -708,7 +708,7 @@ {$alts p/(list silk)} :: options {$cntr p/mark q/coin r/beam} :: local synthesis {$bunt p/mark} :: example of mark - {$call p/silk q/silk} :: slam + {$cnhp p/silk q/silk} :: slam {$cast p/mark q/silk} :: translate {$core p/beam} :: build program {$diff p/silk q/silk} :: diff diff --git a/neo/van/dill.hoon b/neo/van/dill.hoon index 8735855a0..f7a9431b9 100644 --- a/neo/van/dill.hoon +++ b/neo/van/dill.hoon @@ -477,7 +477,7 @@ :_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~)) =. hey.all ?^(hey.all hey.all `hen) ?: ?=($init -.q.hic) - :: ~& [%call-init hen] + :: ~& [%cnhp-init hen] ?: =(ore.all `p.q.hic) [[hen %give q.hic]~ ..^$] =: ore.all `p.q.hic diff --git a/neo/van/ford.hoon b/neo/van/ford.hoon index 4e19879c0..b71d3e83f 100644 --- a/neo/van/ford.hoon +++ b/neo/van/ford.hoon @@ -1286,7 +1286,7 @@ =. typ ?+(-.typ typ $face q.typ) (fine cof [%& p.kas [typ val]]) :: - $call + $cnhp :: %+ cool |.(leaf+"ford: call {<`@p`(mug kas)>}") %. [cof p.kas q.kas] ;~ cope diff --git a/sys/hoon.hoon b/sys/hoon.hoon index 9b4d24b00..51f03ada3 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -5470,7 +5470,7 @@ ++ mare (each manx marl) :: node or nodes ++ maru (each tuna marl) :: interp or nodes ++ tuna :: maybe interpolation - $^(manx {?($tape $manx $marl $call) p/twig}) :: + $^(manx {?($tape $manx $marl $cnhp) p/twig}) :: -- :: $^ {p/twig q/twig} :: $% :: @@ -5526,7 +5526,7 @@ :: :::::: invocations {$cncb p/wing q/(list (pair wing twig))} :: %_ {$cndt p/twig q/twig} :: %. - {$call p/twig q/(list twig)} :: %- + {$cnhp p/twig q/(list twig)} :: %- {$cntr p/wing q/twig r/(list (pair wing twig))} :: %* {$cnkt p/twig q/twig r/twig s/twig} :: %^ {$cnls p/twig q/twig r/twig} :: %+ @@ -6162,7 +6162,7 @@ =. wat ~ =+ cys=~(boil ap p.sec) ?: ?=($herb -.cys) - [%call (home p.sec) [%$ axe] ~] + [%cnhp (home p.sec) [%$ axe] ~] $(sec cys) :: {$kelp *} @@ -6512,9 +6512,9 @@ :: {$leaf *} ~(clam al boil) {$limb *} [%cnts [p.gen ~] ~] - {$tell *} [%call [%limb %noah] [%wrap [%cltr p.gen]] ~] + {$tell *} [%cnhp [%limb %noah] [%wrap [%cltr p.gen]] ~] {$wing *} [%cnts p.gen ~] - {$yell *} [%call [%limb %cain] [%wrap [%cltr p.gen]] ~] + {$yell *} [%cnhp [%limb %cain] [%wrap [%cltr p.gen]] ~] :: {$bcpt *} ~(clam al boil) {$bccb *} ~(clam al boil) @@ -6569,10 +6569,10 @@ :: {$bunt *} [%burn ~(bunt al %herb p.gen)] {$cncb *} [%like [%wing p.gen] %cnts p.gen q.gen] - {$cndt *} [%call q.gen [p.gen ~]] - {$cnkt *} [%call p.gen q.gen r.gen s.gen ~] - {$cnls *} [%call p.gen q.gen r.gen ~] - {$call *} [%cnsg [%$ ~] p.gen q.gen] + {$cndt *} [%cnhp q.gen [p.gen ~]] + {$cnkt *} [%cnhp p.gen q.gen r.gen s.gen ~] + {$cnls *} [%cnhp p.gen q.gen r.gen ~] + {$cnhp *} [%cnsg [%$ ~] p.gen q.gen] {$cnsg *} :: [%cntr p.gen q.gen (hail(gen [%cltr r.gen]) 6)] :^ %cntr p.gen q.gen :: @@ -6596,14 +6596,14 @@ (weld p.gen `wing`[[%& 2] ~]) (turn r.gen |=({p/wing q/twig} [p [%per [%$ 3] q]])) :: - {$ward *} [%like [%call p.gen q.gen ~] q.gen] + {$ward *} [%like [%cnhp p.gen q.gen ~] q.gen] {$cast *} [%like ~(bunt al [%herb p.gen]) q.gen] {$show *} :+ %hint :- %mean =+ fek=~(feck ap p.gen) ?^ fek [%rock %tas u.fek] - [%brdt [~ ~] [%call [%limb %cain] [%wrap [%per [%$ 3] p.gen]] ~]] + [%brdt [~ ~] [%cnhp [%limb %cain] [%wrap [%per [%$ 3] p.gen]] ~]] q.gen :: {$lurk *} [%hint [%mean [%brdt [~ ~] p.gen]] q.gen] @@ -6627,7 +6627,7 @@ {$memo *} [%hint [%memo %rock %$ p.gen] q.gen] {$dump *} :+ %hint - [%slog [%sand %$ p.gen] [%call [%limb %cain] [%wrap q.gen] ~]] + [%slog [%sand %$ p.gen] [%cnhp [%limb %cain] [%wrap q.gen] ~]] r.gen :: {$ddup *} [%hint [%germ p.gen] q.gen] @@ -6655,7 +6655,7 @@ ^ [[%xmn i.p.gen] $(p.gen t.p.gen)] $manx [p.i.p.gen $(p.gen t.p.gen)] $tape [[%nub p.i.p.gen] $(p.gen t.p.gen)] - $call [%call p.i.p.gen [$(p.gen t.p.gen)]~] + $cnhp [%cnhp p.i.p.gen [$(p.gen t.p.gen)]~] $marl =- [%cndt [p.i.p.gen $(p.gen t.p.gen)] -] ^- twig :+ %new [%base %cell] @@ -6682,7 +6682,7 @@ |- ^- twig ?- yex {* $~} [%per [%$ 3] i.yex] - {* ^} [%call [%$ 2] [%per [%$ 3] i.yex] $(yex t.yex) ~] + {* ^} [%cnhp [%$ 2] [%per [%$ 3] i.yex] $(yex t.yex) ~] $~ !! == == @@ -6708,7 +6708,7 @@ :+ %brdt [~ ~] :: |. :^ %cnls :: %+ [%per [%limb %v] p.gen] :: =>(v {p.gen}) - [%call [%limb %b] [%limb %c] ~] :: (b c) + [%cnhp [%limb %b] [%limb %c] ~] :: (b c) :+ %cnts [%a ~] :: a(,.+6 c) [[[[%| 0 ~] [%& 6] ~] [%limb %c]] ~] :: == :: @@ -6719,7 +6719,7 @@ [%per [%limb %v] p.gen] :: =>(v {p.gen}) :+ %pin [%name %b [%per [%limb %v] q.gen]] :: =+ b==>(v {q.gen}) :+ %pin :: =+ c=(a b) - [%name %c [%call [%limb %a] [%limb %b] ~]] :: + [%name %c [%cnhp [%limb %a] [%limb %b] ~]] :: :+ %sure :: ?>(=(`*`c `*`b) c) :+ %same :: [%cast [%base %noun] [%limb %c]] :: @@ -6796,7 +6796,7 @@ {$ifno *} [%if [%fits [%base %null] p.gen] q.gen r.gen] {$not *} [%if p.gen [%rock %f 1] [%rock %f 0]] {$wrap *} - [%call [%limb %onan] [%spit [%bunt [%limb %abel]] p.gen] ~] + [%cnhp [%limb %onan] [%spit [%bunt [%limb %abel]] p.gen] ~] :: {$need *} ?: ?: ?=(@ p.gen) @@ -6892,7 +6892,7 @@ $cltr (lead -.gen %.(+.gen moar)) $cncb (lead -.gen %.(+.gen (twin noop moan))) $cndt (lead -.gen %.(+.gen dubs)) - $call (lead -.gen %.(+.gen (twin expr moar))) + $cnhp (lead -.gen %.(+.gen (twin expr moar))) $cntr (lead -.gen %.(+.gen (trio noop expr moan))) $cnkt (lead -.gen %.(+.gen (quad expr expr expr expr))) $cnls (lead -.gen %.(+.gen trey)) @@ -8010,7 +8010,7 @@ =+ vat=$(gen p.gen) %= $ gen - :- [%call [%limb %onan] [%hand p:!>(*span) [%1 p.vat]] ~] + :- [%cnhp [%limb %onan] [%hand p:!>(*span) [%1 p.vat]] ~] [%hand p.vat q.vat] == :: @@ -8482,7 +8482,7 @@ {$twig *} (play p.gen) {$wrap *} %= $ gen - [%call [%limb %onan] [%hand p:!>(*span) [%1 $(gen p.gen)]] ~] + [%cnhp [%limb %onan] [%hand p:!>(*span) [%1 $(gen p.gen)]] ~] == {$lost *} %void {$spit *} (cell $(gen p.gen) $(gen q.gen)) @@ -9383,7 +9383,7 @@ ++ glam ~+((glue ace)) ++ hasp ;~ pose (ifix [sel ser] wide) - (stag %call (ifix [pel per] (most ace wide))) + (stag %cnhp (ifix [pel per] (most ace wide))) (stag %sand (stag %t qut)) %+ cook |=(a/coin [%sand ?:(?=({$~ $tas *} a) %tas %ta) ~(rent co a)]) @@ -9670,7 +9670,7 @@ (cold %tape hep) (cold %manx lus) (cold %marl tar) - (cold %call cen) + (cold %cnhp cen) == :: ++ wide-top :: wide outer top @@ -9916,7 +9916,7 @@ == :- '(' %+ stag %bcsm - %+ stag %call + %+ stag %cnhp %+ ifix [pel per] ;~(plug wide ;~(pose ;~(pfix ace (most ace wyde)) (easy ~))) :- '{' @@ -9998,7 +9998,7 @@ :- '\'' (stag %sand (stag %t qut)) :- '(' - (stag %call (ifix [pel per] (most ace wide))) + (stag %cnhp (ifix [pel per] (most ace wide))) :- '{' (stag %bccl (ifix [kel ker] (most ace wide))) :- '*' @@ -10165,8 +10165,8 @@ ^. stet ^. limo :~ ['^' (rune ket %cnkt exqy)] ['+' (rune lus %cnls exqx)] - ['-' (rune hep %call exqk)] - [':' (rune col %call exqz)] + ['-' (rune hep %cnhp exqk)] + [':' (rune col %cnhp exqz)] == == == @@ -10211,8 +10211,8 @@ ['.' (rune dot %cndt expb)] ['^' (rune ket %cnkt expd)] ['+' (rune lus %cnls expc)] - ['-' (rune hep %call expk)] - [':' (rune col %call expi)] + ['-' (rune hep %cnhp expk)] + [':' (rune col %cnhp expi)] ['~' (rune sig %cnsg expu)] ['*' (rune tar %cntr expm)] ['=' (rune tis %cnts exph)] @@ -10257,7 +10257,7 @@ (word %cndt expb) (word %cnkt expd) (word %cnls expc) - (word %call expk) + (word %cnhp expk) (word %cnsg expu) (word %cntr expm) (word %cnts exph) diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index 86c6d78e1..aea95bf07 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -482,7 +482,7 @@ :_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~)) =. hey.all ?^(hey.all hey.all `hen) ?: ?=($init -.q.hic) - :: ~& [%call-init hen] + :: ~& [%cnhp-init hen] ?: =(ore.all `p.q.hic) [[hen %give q.hic]~ ..^$] =: ore.all `p.q.hic @@ -583,7 +583,7 @@ :_(+>.$ ?~(hey.all ~ [u.hey.all %slip %d p.tac]~)) =. hey.all ?^(hey.all hey.all `hen) ?: ?=($init -.tac) - :: ~& [%call-init hen] + :: ~& [%cnhp-init hen] ?: =(ore.all `p.tac) [[hen %give tac]~ +>.$] =: ore.all `p.tac