diff --git a/arvo/ames.hoon b/arvo/ames.hoon index cdd9a101b..97d1923d8 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1023,7 +1023,7 @@ %^ ~(ha go ton.fox) our `mace`[[0 rig] ~] - `will`[[(sign:as:loy _@ (shaf %self (sham syp))) syp fak] ~] + `will`[[(sign:as:loy *@ (shaf %self (sham syp))) syp fak] ~] fak.ton fak == @@ -1036,7 +1036,7 @@ ?: &(!fak !fim) !! :: not fake & bad fig =+ mac=`mace`[[0 sec:ex:loy] ~] =+ syp=`step`[`bray`[0 ~ our now] [%en %czar ~] pub:ex:loy] - =+ ded=`deed`[(sign:as:loy _@ (shaf %self (sham syp))) syp fak] + =+ ded=`deed`[(sign:as:loy *@ (shaf %self (sham syp))) syp fak] =+ buq=`buck`[mac [ded ~]] =: ton.fox (~(ha go ton.fox) our buq) zac.fox (~(put by zac.fox) our *corn) diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 309cb2d62..c1436ddd8 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -2127,7 +2127,7 @@ ++ hark |= num=@ud ^- [(unit pimp) _+>] - =. +>.$ abet:(busk:(yule %nil) num _@ ~ %& %js !>((duty nap you))) + =. +>.$ abet:(busk:(yule %nil) num *@ ~ %& %js !>((duty nap you))) [`(need (~(get by q.rey) num)) +>.$] :: ++ harp diff --git a/arvo/ford.hoon b/arvo/ford.hoon index dcba5f877..06146ae12 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -968,7 +968,7 @@ :: ++ body :: produce functions |= [cof=cafe src=(list hoop)] - ^- (bolt _..body) + ^- (bolt ,_..body) ?~ src (fine cof ..body) %+ cope (wilt cof i.src) |= [cof=cafe sel=_..body] @@ -1149,7 +1149,7 @@ :: ++ wilt :: process body entry |= [cof=cafe hop=hoop] - ^- (bolt _..wilt) + ^- (bolt ,_..wilt) ?- -.hop %& (fine cof ..wilt(boy [p.hop boy])) %| @@ -1164,7 +1164,7 @@ (fine cof sel(boy [[%tssg boy.sel] boy])) =+ [all=(lark (slat %tas) arc) sel=..wilt] %+ cope - |- ^- (bolt (pair (map term foot) _..wilt)) + |- ^- (bolt (pair (map term foot) ,_..wilt)) ?~ all (fine cof ~ ..wilt) %+ cope $(all l.all) |= [cof=cafe lef=(map term foot) sel=_..wilt] diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 25378acfb..49ae7c93d 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -197,10 +197,9 @@ $% :: [%$ p=axis] :: simple leg :: :::::: tiling - [%bccb p=tile] :: bunt a tile [%bccm p=tile] :: clam a tile [%bcpt p=wing q=tile] :: whip p into q - [%bctr p=tile] :: static bunt w/ ^~ + [%bctr p=tile] :: bunt a tile w/ ^~ [%bczp p=base] :: bunt an axil :: :::::: cores [%brcb p=tile q=(map term foot)] :: %gold tray, sample p @@ -309,6 +308,7 @@ [%wtsg p=wing q=twig r=twig] :: if p is null [%wtsz p=tiki q=twig r=twig] :: tiki %wtsg [%wtts p=tile q=wing] :: if q is in tile p + [%wttz p=tile q=tiki] :: tiki %wtts [%wtzp p=twig] :: logical NOT :: :::::: special [%zpcb p=spot q=twig] :: debug info in trace @@ -5984,7 +5984,7 @@ ?@(p.lot [%dtzy %$ p.lot] [$(p.lot -.p.lot) $(p.lot +.p.lot)]) :: %many - |-(^-(twig ?~(p.lot [%bczp %null] [^$(lot i.p.lot) $(p.lot t.p.lot)]))) + [%cltr (turn p.lot |=(a=coin ^$(lot a)))] == :: ++ look @@ -6150,7 +6150,7 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2fB, macro expansion :: :: -++ ah +++ ah :: tiki engine |_ tig=tiki ++ blue |= gen=twig @@ -6158,6 +6158,17 @@ ?. &(?=(| -.tig) ?=(~ p.tig)) gen [%tsgr [~ 3] gen] :: + ++ pink + |= tyl=tile + ^- tile + ?. &(?=(| -.tig) ?=(~ p.tig)) tyl + ?- -.tyl + ?(%leaf %axil) tyl + %herb [%herb [%tsgr [~ 3] p.tyl]] + %weed [%weed [%tsgr [~ 3] p.tyl]] + * [%herb [%tsgr [~ 3] [%bccm tyl]]] + == + :: ++ gray |= gen=twig ^- twig @@ -6174,7 +6185,7 @@ == -- :: -++ al +++ al :: tile engine ~% %al +>+ == @@ -6344,7 +6355,7 @@ == -- :: -++ ap +++ ap :: twig engine ~% %ap +> == @@ -6386,9 +6397,8 @@ ?- gen [~ *] [%cnts [gen ~] ~] [%bccm *] ~(clam al p.gen) - [%bccb *] ~(bunt al p.gen) [%bctr *] [%ktsg ~(bunt al p.gen)] - [%bczp *] [%bccb %axil p.gen] + [%bczp *] [%bctr %axil p.gen] [%brcb *] [%tsls [%bctr p.gen] [%brcn q.gen]] [%brdt *] [%brcn (~(put by *(map term foot)) %$ [%ash p.gen])] [%brtr *] [%brfs p.gen (~(put by *(map term foot)) %$ [%elm q.gen])] @@ -6662,6 +6672,11 @@ =+ vaw=~(. ah p.gen) %- gray:vaw [%wtpt puce:vaw (blue:vaw q.gen) (blue:vaw r.gen)] + :: + [%wttz *] + =+ vaw=~(. ah q.gen) + %- gray:vaw + [%wtts (pink:vaw p.gen) puce:vaw] :: [%zpcb *] q.gen [%zpgr *] @@ -8783,9 +8798,7 @@ :- '(' (stag %cnhp (ifix [pel per] (most ace wide))) :- '*' - ;~ pose - (stag %bctr ;~(pfix tar hill)) - == + (stag %bctr ;~(pfix tar hill)) :- '+' ;~ pose (stag %dtls ;~(pfix lus (ifix [pel per] wide))) @@ -8811,15 +8824,7 @@ == :- '.' ;~ pose - %+ cook - |= a=coin ^- twig - ?- -.a - ~ [%dtzy p.a] - %blob [%dtzz %$ p.a] - %many [%cltr (turn p.a |=(b=coin ^$(a b)))] - == - ;~(pfix dot perd:so) - :: + (cook (jock |) ;~(pfix dot perd:so)) (cook |=(a=wing [%cnts a ~]) rope) == :- ['0' '9'] @@ -8859,8 +8864,6 @@ (stag %cnzz rope) (stag %bczp (cold %cell ket)) == - :- '_' - (stag %bccb ;~(pfix cab hill)) :- '`' ;~ pfix tec ;~ pose @@ -8949,7 +8952,7 @@ ['=' (rung tis %bark exqe)] :- '+' %+ cook - |=([a=tile b=tile] [%weed [%brls a [%bccb b]]]) + |=([a=tile b=tile] [%weed [%brls a [%bctr b]]]) ;~(pfix lus (toad exqb)) :- '%' ;~ pfix cen @@ -9031,7 +9034,6 @@ == :- '$' ;~ pose - (rune cab %bccb expv) (rune com %bccm expv) (stag %bccm (noil tol)) == @@ -9130,7 +9132,7 @@ ['>' (rune gar %wtgr expb)] ['-' (rune hep %wthz expx)] ['^' (rune ket %wtkz expf)] - ['=' (rune tis %wtts expw)] + ['=' (rune tis %wttz expw)] ['+' (rune lus %wtlz expy)] ['&' (rune pam %wtpm exps)] ['@' (rune pat %wtpz expf)] @@ -9264,7 +9266,7 @@ ++ expt |.((butt ;~(gunk loaf race))) :: twig, [tile twig]s ++ expu |.(;~(gunk lobe wisp)) :: tile, core tail ++ expv |.(lobe) :: tile - ++ expw |.(;~(gunk lobe rope)) :: tile and wing + ++ expw |.(;~(gunk lobe teak)) :: tile and tiki ++ expx |.((butt ;~(gunk teak race))) :: tiki, [tile twig]s ++ expy |.((butt ;~(gunk teak loaf race))) :: tiki twig [tile twig]s ++ expz |.(loaf(bug &)) :: twig with tracing @@ -9788,10 +9790,10 @@ |= but=type ^- vile =+ pal=|=(a=@t ^-(type (~(play ut but) (vice a)))) - :* typ=(pal '_type') - duc=(pal '_duct') - pah=(pal '_path') - mev=(pal '_[%meta vase]') + :* typ=(pal '*type') + duc=(pal '*duct') + pah=(pal '*path') + mev=(pal '*[%meta vase]') == :: ++ is :: operate in time diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 9c2883664..d159e3c10 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -611,7 +611,7 @@ ++ poxo :: node to tape =< |=(a=manx `tape`(apex a ~)) |_ unq=? - ++ apex :: node to tape + ++ apex :: top level |= [mex=manx rez=tape] ^- tape ?: ?=([%$ [[%$ *] ~]] g.mex) @@ -1132,7 +1132,7 @@ |= p=tako :: XX slow ^- (set tako) =+ y=(tako-to-yaki p) - =+ t=(~(put in _(set tako)) p) + =+ t=(~(put in *(set tako)) p) %+ roll p.y |= [q=tako s=_t] ?: (~(has in s) q) :: already done @@ -1290,7 +1290,7 @@ =+ nak=(~(get by r.ank) i.pat) %= ank r %+ ~(put by r.ank) i.pat - $(pat t.pat, ank (fall nak _ankh)) + $(pat t.pat, ank (fall nak *ankh)) == :: ++ forge-yaki :: forge-yaki:ze @@ -1336,8 +1336,8 @@ |= [p=yaki q=yaki] :: (future zeal) ^- (set yaki) :: zear still uses zule %- reduce-merge-points :: this is test-only - =+ s=(~(put in _(set tako)) r.p) :: not actually used - =+ t=(~(put in _(set tako)) t.p) :: but might be active + =+ s=(~(put in *(set tako)) r.p) :: not actually used + =+ t=(~(put in *(set tako)) t.p) :: but might be active =| u=(set yaki) :: eventually |- ^- (set yaki) =+ v=(~(int in s) t) :: found common @@ -1368,7 +1368,7 @@ %- reduce-merge-points =+ r=(reachable-takos r.p) |- ^- (set yaki) - ?: (~(has in r) q) (~(put in _(set yaki)) q) :: done + ?: (~(has in r) q) (~(put in *(set yaki)) q) :: done %+ roll p.q |= [t=tako s=(set yaki)] ?: (~(has in r) t) @@ -1714,7 +1714,7 @@ %init :: force fine ?. =(let 0) :: hell no !! - =+ hot=(~(put by _(map aeon tako)) 1 (~(got by hit.for) let.for)) + =+ hot=(~(put by *(map aeon tako)) 1 (~(got by hit.for) let.for)) [~ [~ [1 hot hut lat]]] :: trivial %fine =+ der=(~(got by hit.for) let.for) @@ -1742,9 +1742,9 @@ =+ yak=-.gar =+ hek=+.gar =. lat -:(update-lat hek ~) :: add new blobs - =. hut (~(put by _(map tako yaki)) r.yak yak) + =. hut (~(put by *(map tako yaki)) r.yak yak) =. let +(let) - =. hit (~(put by _(map aeon tako)) let r.yak) + =. hit (~(put by *(map aeon tako)) let r.yak) [~ [~ [let hit hut lat]]] == :: @@ -1824,7 +1824,7 @@ %+ mix ?~(q.ank 0 p.u.q.ank) =+ axe=1 |- ^- cash - ?~ r.ank _@ + ?~ r.ank *@ ;: mix (shaf %dash (mix axe (shaf %dush (mix p.n.r.ank p.q.n.r.ank)))) $(r.ank l.r.ank, axe (peg axe 2)) @@ -2689,18 +2689,18 @@ ++ acru :: asym cryptosuite $_ ^? |% :: opaque object ++ as ^? :: asym ops - |% ++ seal |=([a=pass b=@ c=@] _@) :: encrypt to a - ++ sign |=([a=@ b=@] _@) :: certify as us + |% ++ seal |=([a=pass b=@ c=@] *@) :: encrypt to a + ++ sign |=([a=@ b=@] *@) :: certify as us ++ sure |=([a=@ b=@] *(unit ,@)) :: authenticate from us ++ tear |= [a=pass b=@] :: accept from a *(unit ,[p=@ q=@]) :: -- :: ++ de |+([a=@ b=@] *(unit ,@)) :: symmetric de, soft - ++ dy |+([a=@ b=@] _@) :: symmetric de, hard - ++ en |+([a=@ b=@] _@) :: symmetric en + ++ dy |+([a=@ b=@] *@) :: symmetric de, hard + ++ en |+([a=@ b=@] *@) :: symmetric en ++ ex ^? :: export - |% ++ fig _@uvH :: fingerprint - ++ pac _@uvG :: default passcode + |% ++ fig *@uvH :: fingerprint + ++ pac *@uvG :: default passcode ++ pub *pass :: public key ++ sec *ring :: private key -- ::