Fixed %deet. Really about to prune.

This commit is contained in:
C. Guy Yarvin 2015-12-22 20:57:10 -08:00
parent 8f63262b74
commit c39ca2e92a

View File

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