mirror of
https://github.com/urbit/shrub.git
synced 2024-12-13 16:03:36 +03:00
Merge commit 'fb67085' into relearning
This commit is contained in:
commit
5234493de6
@ -6424,11 +6424,9 @@
|
|||||||
|%
|
|%
|
||||||
++ burn
|
++ burn
|
||||||
=+ gil=*(set span)
|
=+ gil=*(set span)
|
||||||
~_ leaf+"burn"
|
|
||||||
%- need
|
|
||||||
|- ^- (unit)
|
|- ^- (unit)
|
||||||
?- sut
|
?- sut
|
||||||
{$atom *} `?~(q.sut 0 u.q.sut)
|
{$atom *} q.sut
|
||||||
{$cell *} %+ biff $(sut p.sut)
|
{$cell *} %+ biff $(sut p.sut)
|
||||||
|=(* (biff ^$(sut q.sut) |=(* `[+>+< +<])))
|
|=(* (biff ^$(sut q.sut) |=(* `[+>+< +<])))
|
||||||
{$core *} (biff $(sut p.sut) |=(* `[p.r.q.sut +<]))
|
{$core *} (biff $(sut p.sut) |=(* `[p.r.q.sut +<]))
|
||||||
@ -6445,7 +6443,7 @@
|
|||||||
{$hold *} ?: (~(has in gil) sut)
|
{$hold *} ?: (~(has in gil) sut)
|
||||||
~
|
~
|
||||||
$(sut repo, gil (~(put in gil) sut))
|
$(sut repo, gil (~(put in gil) sut))
|
||||||
$noun `0
|
$noun ~
|
||||||
$void ~
|
$void ~
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
@ -7177,8 +7175,11 @@
|
|||||||
{$zinc *} =+(vat=$(gen p.gen) [(wrap(sut p.vat) %zinc) q.vat])
|
{$zinc *} =+(vat=$(gen p.gen) [(wrap(sut p.vat) %zinc) q.vat])
|
||||||
{$burn *}
|
{$burn *}
|
||||||
=+ nef=$(gen p.gen)
|
=+ nef=$(gen p.gen)
|
||||||
=+ moc=(mink [burn q.nef] |=({* *} ~))
|
:- p.nef
|
||||||
[p.nef ?:(?=($0 -.moc) [%1 p.moc] q.nef)]
|
=+ cag=burn
|
||||||
|
?~ cag q.nef
|
||||||
|
=+ moc=(mink [u.cag q.nef] |=({* *} ~))
|
||||||
|
?:(?=($0 -.moc) [%1 p.moc] q.nef)
|
||||||
::
|
::
|
||||||
{$name *} =+(vat=$(gen q.gen) [(conk(sut p.vat) p.gen) q.vat])
|
{$name *} =+(vat=$(gen q.gen) [(conk(sut p.vat) p.gen) q.vat])
|
||||||
{$tune *} [(face p.gen sut) [%0 %1]]
|
{$tune *} [(face p.gen sut) [%0 %1]]
|
||||||
|
Loading…
Reference in New Issue
Block a user