diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 06fa97c1b..3d36f39f6 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1759,7 +1759,7 @@ %+ turn paz |= him=ship :- hen - [%pass /ye %g %mess [him ye/~] p.p.bon [%txt !>(;;(,@t r.bon))]] + [%pass /ye %g %mess [him ye/~] p.p.bon [%txt !>(((hard ,@t) r.bon))]] == :: %mulk diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index cd71842cb..c5ef4ffb5 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -274,7 +274,7 @@ [%smdt p=twig q=tusk] :: [%smdq p=(list beer)] :: assemble string [%smsg p=twig q=tusk] :: gonads - [%smsm p=twig q=twig] :: make sure q is a p + [%smsm p=tile q=twig] :: make sure q is a p :: :::::: compositions [%tsbr p=tile q=twig] :: push bunt: =+(_p q) [%tscl p=tram q=twig] :: p changes, then q @@ -6550,7 +6550,8 @@ :: [%smsm *] :: ;; :+ %tsgr [%ktts %v ~ 1] :: => v=. - :+ %tsls [%ktts %a [%tsgr [%cnzy %v] p.gen]] :: =+ a==>(v {p.gen}) + :+ %tsls :+ %ktts %a :: =+ ^= a + [%tsgr [%cnzy %v] [%bccm p.gen]] :: =>(v ,{p.gen}) :+ %tsls [%ktts %b [%tsgr [%cnzy %v] q.gen]] :: =+ b==>(v {q.gen}) :+ %tsls :: =+ c=(a b) [%ktts %c [%cnhp [%cnzy %a] [%cnzy %b] ~]] :: @@ -8822,7 +8823,7 @@ =+ rev=(plex b) ?~ rev ~ %- some - :+ %smsm ~(clam al a) + :+ %smsm a [%dtkt %dtzz %$ %cx u.rev] ;~(plug hill rood) == @@ -9070,7 +9071,7 @@ :~ [':' (rune col %smcl expi)] ['.' (rune dot %smdt expi)] ['~' (rune sig %smsg expi)] - [';' (rune sem %smsm expb)] + [';' (rune sem %smsm expo)] == == :- '=' @@ -9336,15 +9337,13 @@ ++ rope :: wing form %+ knee *wing |. ~+ - %+ (slug |=([a=wing b=wing] (weld a b))) + %+ (slug |=([a=limb b=wing] [a b])) dot ;~ pose %+ cook - |=([a=(list) b=term] [?~(a b [%| (lent a) b]) ~]) + |=([a=(list) b=term] ?~(a b [%| (lent a) b])) ;~(plug (star ket) ;~(pose sym (cold %$ buc))) :: - %+ cook - |=(a=limb [a ~]) %+ cook |=(a=axis [%& a]) ;~ pose diff --git a/main/app/bang/core.hook b/main/app/bang/core.hook index 0acd6827a..48caad4a1 100644 --- a/main/app/bang/core.hook +++ b/main/app/bang/core.hook @@ -8,6 +8,6 @@ :: ++ pour |= [ost=bone * sih=*] - ~& bang-resp/;;(,[term term] [&1 &2]:sih) + ~& bang-resp/;;([term term] [&1 &2]:sih) :_(+> [ost %pass / %g %cide %$]~) -- diff --git a/main/app/cat/core.hook b/main/app/cat/core.hook index 6c1aaa591..f42f9c745 100644 --- a/main/app/cat/core.hook +++ b/main/app/cat/core.hook @@ -17,7 +17,7 @@ =+ ark=;;(arch .^(%cy pax)) ?~ q.ark ~[leaf/"file {} not available"] :- leaf/(spud pax) - %+ turn (lore ;;(,@t .^(%cx pax))) + %+ turn (lore ;;(@t .^(%cx pax))) |= a=cord leaf/(trip a) == diff --git a/main/app/poke/core.hook b/main/app/poke/core.hook index 22f5774ed..d0da97dd7 100644 --- a/main/app/poke/core.hook +++ b/main/app/poke/core.hook @@ -9,6 +9,6 @@ :: ++ pour |= [ost=bone * sih=*] - ~& poke-resp/;;(,[term term] [&1 &2]:sih) + ~& poke-resp/;;([term term] [&1 &2]:sih) :_(+> [ost %pass / %g %cide %$]~) --