Stash commit; in middle of debugging nest bug.

This commit is contained in:
C. Guy Yarvin 2016-01-13 17:46:01 -08:00
parent 367adbadd7
commit e872e068af
3 changed files with 45 additions and 43 deletions

View File

@ -752,7 +752,7 @@
|= txt/tape :: |= txt/tape ::
^- (each (unit (each dojo-command tape)) hair) :: prefix+result ^- (each (unit (each dojo-command tape)) hair) :: prefix+result
=+ len=+((lent txt)) :: line length =+ len=+((lent txt)) :: line length
=. txt :(weld buf txt "\0a") :: =. txt (weld buf `tape`(weld txt "\0a")) ::
=+ vex=((full dp-command-line):dp [1 1] txt) :: =+ vex=((full dp-command-line):dp [1 1] txt) ::
?: =(q.p.vex len) :: matched to line end ?: =(q.p.vex len) :: matched to line end
[%& ~] :: [%& ~] ::

View File

@ -973,9 +973,11 @@
=< (sh-fact %mor (turn pan .)) =< (sh-fact %mor (turn pan .))
|=(a/(set partner) [%txt <a>]) :: XX ~(te-whom te man.she a) |=(a/(set partner) [%txt <a>]) :: XX ~(te-whom te man.she a)
:: ::
++ who :: %who ++ who :: %who
|= pan/(set partner) ^+ ..sh-work |= pan/(set partner) ^+ ..sh-work
=< (sh-fact %mor (murn (sort (~(tap by q.owners.she)) aor) .)) =+ foo=`(list (pair partner atlas))`(~(tap by q.owners.she))
=+ bar=`(list (pair partner atlas))`(sort foo aor)
=< (sh-fact %mor (murn (sort (~(tap by q.owners.she) ~) aor) .))
|= {pon/partner alt/atlas} ^- (unit sole-effect) |= {pon/partner alt/atlas} ^- (unit sole-effect)
?. |(=(~ pan) (~(has in pan) pon)) ~ ?. |(=(~ pan) (~(has in pan) pon)) ~
=- `[%tan rose+[", " `~]^- leaf+~(ta-full ta man.she pon) ~] =- `[%tan rose+[", " `~]^- leaf+~(ta-full ta man.she pon) ~]

View File

@ -7656,8 +7656,8 @@
=- [p.tez (doge q.p.tez q.tez)] =- [p.tez (doge q.p.tez q.tez)]
^= tez ^= tez
^- {p/{p/(map span @) q/(map @ wine)} q/wine} ^- {p/{p/(map span @) q/(map @ wine)} q/wine}
?: (~(meet ut sut) -:!>(*span)) :: ?: (~(meet ut sut) -:!>(*span))
[dex %span] :: [dex %span]
?- sut ?- sut
$noun [dex sut] $noun [dex sut]
$void [dex sut] $void [dex sut]
@ -7784,50 +7784,50 @@
== ==
=+ sut=`span`%noun =+ sut=`span`%noun
|% |%
++ burn
=+ gil=*(set span)
|- ^- *
?- sut
{$atom *} ?~(q.sut 0 u.q.sut)
{$cell *} [$(sut p.sut) $(sut q.sut)]
{$core *} [p.r.q.sut $(sut p.sut)]
{$face *} $(sut repo)
{$fork *} $(sut -.p.sut)
{$frog *} $(sut -.p.sut)
{$hold *} ?: (~(has in gil) sut)
~_ (dunk %span)
~|(%burn-loop !!)
$(sut repo, gil (~(put in gil) sut))
$noun 0
$void ~|(%burn-void !!)
==
::++ burn ::++ burn
:: =+ gil=*(set span) :: =+ gil=*(set span)
:: ~| %burn :: |- ^- *
:: %- need
:: |- ^- (unit)
:: ?- sut :: ?- sut
:: {$atom *} `?~(q.sut 0 u.q.sut) :: {$atom *} ?~(q.sut 0 u.q.sut)
:: {$cell *} %+ biff $(sut p.sut) :: {$cell *} [$(sut p.sut) $(sut q.sut)]
:: |=(* (biff ^$(sut q.sut) |=(* `[+>+< +<]))) :: {$core *} [p.r.q.sut $(sut p.sut)]
:: {$core *} (biff $(sut p.sut) |=(* `[p.r.q.sut +<]))
:: {$face *} $(sut repo) :: {$face *} $(sut repo)
:: {$fork *} =+ yed=(~(tap in p.sut)) :: {$fork *} $(sut -.p.sut)
:: |- ^- (unit)
:: ?~ yed ~
:: =+ [dis=^$(sut i.yed) mor=$(yed t.yed)]
:: ?~ dis mor
:: ?~ mor dis
:: ?: =(.?(u.mor) .?(u.dis))
:: ?:((gor u.mor u.dis) mor dis)
:: ?@(u.mor mor dis)
:: {$frog *} $(sut -.p.sut) :: {$frog *} $(sut -.p.sut)
:: {$hold *} ?: (~(has in gil) sut) :: {$hold *} ?: (~(has in gil) sut)
:: ~ :: ~_ (dunk %span)
:: ~|(%burn-loop !!)
:: $(sut repo, gil (~(put in gil) sut)) :: $(sut repo, gil (~(put in gil) sut))
:: $noun `0 :: $noun 0
:: $void ~ :: $void ~|(%burn-void !!)
:: == :: ==
++ burn
=+ gil=*(set span)
~| %burn
%- need
|- ^- (unit)
?- sut
{$atom *} `?~(q.sut 0 u.q.sut)
{$cell *} %+ biff $(sut p.sut)
|=(* (biff ^$(sut q.sut) |=(* `[+>+< +<])))
{$core *} (biff $(sut p.sut) |=(* `[p.r.q.sut +<]))
{$face *} $(sut repo)
{$fork *} =+ yed=(~(tap in p.sut))
|- ^- (unit)
?~ yed ~
=+ [dis=^$(sut i.yed) mor=$(yed t.yed)]
?~ dis mor
?~ mor dis
?: =(.?(u.mor) .?(u.dis))
?:((gor u.mor u.dis) mor dis)
?@(u.mor mor dis)
{$frog *} $(sut -.p.sut)
{$hold *} ?: (~(has in gil) sut)
~
$(sut repo, gil (~(put in gil) sut))
$noun `0
$void ~
==
:: ::
++ busk ++ busk
~/ %busk ~/ %busk