diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index c60d0484a4..eab869926a 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -4253,6 +4253,14 @@ =+ zac=(lust i.q.tub p.tub) [zac [~ i.q.tub [zac t.q.tub]]] :: +++ perk :: parse cube fork + |* a/(pole @tas) + ?~ a fail + ;~ pose + (cold -.a (jest -.a)) + $(a +.a) + == +:: ++ pick :: rule for ++each |* {a/rule b/rule} ;~ pose @@ -6447,7 +6455,7 @@ %moot moot %mull mull %nest nest - %perk perk + %peel peel %play play %peek peek %repo repo @@ -6960,7 +6968,7 @@ ?^ zem :+ %& [`axe lon] [%| (peg 2 p.u.zem) [[sut(p.q %gold) q.u.zem] ~ ~]] - =+ pec=(perk way p.q.sut) + =+ pec=(peel way p.q.sut) ?. sam.pec lose ?: con.pec $(sut p.sut, axe (peg axe 3)) $(sut (peek(sut p.sut) way 2), axe (peg axe 6)) @@ -7611,17 +7619,6 @@ == == -- :: - ++ perk - |= {way/vial met/?($gold $iron $lead $zinc)} - ^- {sam/? con/?} - ?: ?=($gold met) [& &] - ?- way - $both [| |] - $free [& &] - $read [?=($zinc met) |] - $rite [?=($iron met) |] - == - :: ++ peek ~/ %peek |= {way/?($read $rite $both $free) axe/axis} @@ -7636,7 +7633,7 @@ {$cell *} ?:(=(2 now) ^$(sut p.sut, axe lat) ^$(sut q.sut, axe lat)) {$core *} ?. =(3 now) %noun - =+ pec=(perk way p.q.sut) + =+ pec=(peel way p.q.sut) %= ^$ axe lat sut @@ -7657,6 +7654,17 @@ * $(sut repo) == :: + ++ peel + |= {way/vial met/?($gold $iron $lead $zinc)} + ^- {sam/? con/?} + ?: ?=($gold met) [& &] + ?- way + $both [| |] + $free [& &] + $read [?=($zinc met) |] + $rite [?=($iron met) |] + == + :: ++ play ~/ %play => .(vet |) diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 2326f165ad..55aff2155d 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2585,14 +2585,6 @@ ?~ myn ~ ?: =(~ t.myn) (trip i.myn) (weld (trip i.myn) `tape`['/' $(myn t.myn)]) - :: :: ++perk:markup - ++ perk :: parse cube fork - |* a/(pole @tas) - ?~ a fail - ;~ pose - (cold -.a (jest -.a)) - $(a +.a) - == :: :: ++poja:markup ++ poja :: parse JSON =< |=(a/cord `(unit json)`(rush a apex))