mirror of
https://github.com/urbit/shrub.git
synced 2024-12-12 10:29:01 +03:00
Merge commit 'bd8c09' into HEAD
This commit is contained in:
commit
ec3322b790
@ -8264,21 +8264,23 @@
|
|||||||
::
|
::
|
||||||
++ heal
|
++ heal
|
||||||
~/ %heal
|
~/ %heal
|
||||||
|= {qog/(unit term) axe/axis ref/type}
|
|= {qug/(unit (unit term)) axe/axis ref/type}
|
||||||
^- type
|
^- type
|
||||||
?: =(1 axe)
|
?: =(1 axe)
|
||||||
?~ qog
|
?~ qug
|
||||||
ref
|
ref
|
||||||
|- ^- type
|
|- ^- type
|
||||||
?- sut
|
?- sut
|
||||||
{$bull *} ?: =(u.qog p.p.sut)
|
{$bull *} ?: &(?=(^ u.qug) =(u.u.qug p.p.sut))
|
||||||
ref
|
ref
|
||||||
(busk(sut $(sut q.sut)) p.p.sut q.p.sut)
|
(busk(sut $(sut q.sut)) p.p.sut q.p.sut)
|
||||||
{$core *} ref
|
{$core *} ref
|
||||||
{$face *} ?.(=(u.qog p.sut) ~|('heal-name' !!) (face p.sut ref))
|
{$face *} ?. |(?=($~ u.qug) =(u.u.qug p.sut))
|
||||||
|
~|('heal-name' !!)
|
||||||
|
(face p.sut ref)
|
||||||
{$fork *} (fork $(sut p.sut) $(sut q.sut))
|
{$fork *} (fork $(sut p.sut) $(sut q.sut))
|
||||||
{$hold *} $(sut repo)
|
{$hold *} $(sut repo)
|
||||||
* ~|([%name u.qog] ~|('heal-name' !!))
|
* ~|([%name u.qug] ~|('heal-name' !!))
|
||||||
==
|
==
|
||||||
=+ [now=(cap axe) lat=(mas axe)]
|
=+ [now=(cap axe) lat=(mas axe)]
|
||||||
=+ gil=*(set type)
|
=+ gil=*(set type)
|
||||||
@ -8991,11 +8993,11 @@
|
|||||||
=+ hoc=(peg axe p.dob)
|
=+ hoc=(peg axe p.dob)
|
||||||
=+ guh=$(peh t.peh, sut s.p.q.dob, axe (peg hoc r.p.q.dob))
|
=+ guh=$(peh t.peh, sut s.p.q.dob, axe (peg hoc r.p.q.dob))
|
||||||
=+ zig=$(peh q.p.q.dob, sut q.q.dob, mur q.guh)
|
=+ zig=$(peh q.p.q.dob, sut q.q.dob, mur q.guh)
|
||||||
=+ zug=(heal [~ +.q.i.peh] p.dob (busk(sut q.zig) p.p.q.dob q.p.q.dob))
|
=+ zug=(heal `q.i.peh p.dob (busk(sut q.zig) p.p.q.dob q.p.q.dob))
|
||||||
[p.guh zug]
|
[p.guh zug]
|
||||||
=+ wuf=(flay (flee dob))
|
=+ wuf=(flay (flee dob))
|
||||||
=+ gav=$(peh t.peh, sut q.wuf, axe (peg axe p.wuf))
|
=+ gav=$(peh t.peh, sut q.wuf, axe (peg axe p.wuf))
|
||||||
[p.gav (heal [~ +.q.i.peh] p.wuf q.gav)]
|
[p.gav (heal `q.i.peh p.wuf q.gav)]
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
++ tock
|
++ tock
|
||||||
|
Loading…
Reference in New Issue
Block a user