About to strip the tree. Minor fixes.

This commit is contained in:
C. Guy Yarvin 2015-12-22 20:48:20 -08:00
parent 38fc2f77dc
commit 8f63262b74
2 changed files with 26 additions and 14 deletions

View File

@ -1292,7 +1292,7 @@
:: ::
++ ra-know :: story monad ++ ra-know :: story monad
|= man/span |= man/span
|* fun/$+(_pa _+>+>) |* fun/$+(_pa _+>)
^+ +>+> ^+ +>+>
=+ pur=(~(get by stories) man) =+ pur=(~(get by stories) man)
?~ pur ?~ pur
@ -2094,12 +2094,12 @@
== ==
:: ::
++ etch-friend :: ++ etch-friend ::
|= {way/wire fun/$+({man/span cuz/station} {(list move) _+>})} |= {way/wire fun/$+({man/span cuz/station} {(list move) _.})}
=+ wer=(etch way) =+ wer=(etch way)
?>(?=($friend -.wer) (fun p.wer q.wer)) ?>(?=($friend -.wer) (fun p.wer q.wer))
:: ::
++ etch-repeat :: ++ etch-repeat ::
|= {way/wire fun/$+({num/@ud src/@p man/span} {(list move) _+>})} |= {way/wire fun/$+({num/@ud src/@p man/span} {(list move) _.})}
=+ wer=(etch way) =+ wer=(etch way)
?>(?=($repeat -.wer) (fun p.wer q.wer r.wer)) ?>(?=($repeat -.wer) (fun p.wer q.wer r.wer))
:: ::

View File

@ -1,4 +1,4 @@
!::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
:::::: :::::: Preface :::::: :::::: :::::: Preface ::::::
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
?> ?=(@ .) :: atom subject ?> ?=(@ .) :: atom subject
@ -184,6 +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
{$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
@ -6794,6 +6795,9 @@
:: ::
{$bush *} {$bush *}
[%wtcl [%bust %bean] $(sec p.sec) $(sec q.sec)] [%wtcl [%bust %bean] $(sec p.sec) $(sec q.sec)]
::
{$dbug *}
[%dbug p.sec $(sec q.sec)]
:: ::
{$fern *} {$fern *}
|- ^- twig |- ^- twig
@ -6826,6 +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)
?: ?=(^ -.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]]
@ -6894,6 +6899,9 @@
[%wtpt [[%& (peg axe 2)] ~] ^$(sec q.sec) ^$(sec p.sec)] [%wtpt [[%& (peg axe 2)] ~] ^$(sec q.sec) ^$(sec p.sec)]
^$(sec q.sec) ^$(sec q.sec)
^$(sec p.sec) ^$(sec p.sec)
::
{$dbug *}
[%dbug p.sec $(sec q.sec)]
:: ::
{$fern *} {$fern *}
|- ^- twig |- ^- twig
@ -6979,15 +6987,23 @@
== ==
:: ::
++ bile ++ bile
^- (each line tile) =+ tyl=boil
=+ boil |- ^- (each line tile)
?: ?=({{$leaf *} *} -) ?: ?=({$dbug *} tyl)
[%& [%leaf p.p.- q.p.-] q.-] $(tyl q.tyl)
[%| -] ?: ?=({{$dbug *} *} tyl)
$(p.tyl q.p.tyl)
?: ?=({{$leaf *} *} tyl)
[%& [%leaf p.p.tyl q.p.tyl] q.tyl]
[%| tyl]
:: ::
++ boil ++ boil
^- tile ^- tile
?+ gen [%herb gen] ?+ gen [%herb gen]
{$base *} [%axil p.gen]
:: {$dbug *} [%dbug p.gen boil(gen q.gen)]
{$dbug *} boil(gen q.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)]
{$bccb *} [%weed p.gen] {$bccb *} [%weed p.gen]
@ -7017,10 +7033,6 @@
{$bcts *} [%bark p.gen boil(gen q.gen)] {$bcts *} [%bark p.gen boil(gen q.gen)]
{$bcwt *} =+ (turn p.gen |=(a/twig boil(gen a))) {$bcwt *} =+ (turn p.gen |=(a/twig boil(gen a)))
?~(- [%axil %void] [%fern -]) ?~(- [%axil %void] [%fern -])
::
{$leaf *} [%leaf p.gen]
{$base *} [%axil p.gen]
{$dbug *} boil(gen q.gen)
== ==
:: ::
++ open ++ open