diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 72b230b79..606a168bf 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -1,4 +1,4 @@ -:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: +!::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: :::::: Preface :::::: :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: ?> ?=(@ .) :: atom subject @@ -184,7 +184,7 @@ $% {$axil p/base} :: base type {$bark p/term q/tile} :: name {$bush p/tile q/tile} :: pair+tag - {$dbug p/spot q/tile} :: set debug + {$deet p/spot q/tile} :: set debug {$fern p/{i/tile t/(list tile)}} :: plain selection {$herb p/twig} :: gate {$kelp p/{i/line t/(list line)}} :: tag selection @@ -6796,7 +6796,7 @@ {$bush *} [%wtcl [%bust %bean] $(sec p.sec) $(sec q.sec)] :: - {$dbug *} + {$deet *} [%dbug p.sec $(sec q.sec)] :: {$fern *} @@ -6830,7 +6830,7 @@ ++ cloq |- ^- {p/toga q/tile} =. sec ?.(?=($herb -.sec) sec ~(boil ap p.sec)) - ?: ?=($dbug -.sec) $(sec q.sec) + ?: ?=($deet -.sec) $(sec q.sec) ?: ?=(^ -.sec) =+ [one=$(sec p.sec) two=$(sec q.sec)] [[%2 p.one p.two] [q.one q.two]] @@ -6900,7 +6900,7 @@ ^$(sec q.sec) ^$(sec p.sec) :: - {$dbug *} + {$deet *} [%dbug p.sec $(sec q.sec)] :: {$fern *} @@ -6987,22 +6987,21 @@ == :: ++ bile - =+ tyl=boil + =+ sec=boil |- ^- (each line tile) - ?: ?=({$dbug *} tyl) - $(tyl q.tyl) - ?: ?=({{$dbug *} *} tyl) - $(p.tyl q.p.tyl) - ?: ?=({{$leaf *} *} tyl) - [%& [%leaf p.p.tyl q.p.tyl] q.tyl] - [%| tyl] + ?: ?=({$deet *} sec) + $(sec q.sec) + ?: ?=({{$deet *} *} sec) + $(p.sec q.p.sec) + ?: ?=({{$leaf *} *} sec) + [%& [%leaf p.p.sec q.p.sec] q.sec] + [%| sec] :: ++ boil ^- tile ?+ gen [%herb gen] {$base *} [%axil p.gen] - :: {$dbug *} [%dbug p.gen boil(gen q.gen)] - {$dbug *} boil(gen q.gen) + {$dbug *} [%deet p.gen boil(gen q.gen)] {$leaf *} [%leaf p.gen] :: {$bcpt *} [%reed boil(gen p.gen) boil(gen q.gen)] @@ -7020,6 +7019,7 @@ boil(gen i.p.gen) =+ :* def=bile(gen i.p.gen) ^= end ^- (list line) + ~| %bccn-foul %+ turn `(list twig)`t.p.gen |=(a/twig =+(bile(gen a) ?>(?=($& -<) ->))) ==