Merge branch 'master' into validate-treap-order

This commit is contained in:
Jared Tobin 2019-05-29 15:40:06 +08:00 committed by GitHub
commit b01a5396dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -682,13 +682,18 @@
=+ ^= arg ^- vase =+ ^= arg ^- vase
%- slop %- slop
?: =(0 p.u.cug) ?: =(0 p.u.cug)
[!>(`path`+.pax) !>(cag)] [!>(`path`+.pax) (ap-cage cag)]
[!>((slag (dec p.u.cug) `path`+.pax)) q.cag] [!>((slag (dec p.u.cug) `path`+.pax)) q.cag]
=^ cam +>.$ (ap-call q.u.cug arg) =^ cam +>.$ (ap-call q.u.cug arg)
?^ cam ?^ cam
(ap-pump:(ap-lame q.u.cug u.cam) | her pax) (ap-pump:(ap-lame q.u.cug u.cam) | her pax)
(ap-pump & her pax) (ap-pump & her pax)
:: ::
++ ap-cage :: cage to tagged vase
|= cag/cage
^- vase
(slop `vase`[[%atom %tas `p.cag] p.cag] q.cag)
::
++ ap-pump :: update subscription ++ ap-pump :: update subscription
~/ %ap-pump ~/ %ap-pump
|= {oak/? her/ship pax/path} |= {oak/? her/ship pax/path}
@ -1094,7 +1099,7 @@
=+ ^= arg ^- vase =+ ^= arg ^- vase
%- slop %- slop
?: =(0 p.u.cug) ?: =(0 p.u.cug)
[!>(`path`pax) !>(cag)] [!>(`path`pax) (ap-cage cag)]
[!>((slag (dec p.u.cug) `path`pax)) q.cag] [!>((slag (dec p.u.cug) `path`pax)) q.cag]
=^ cam +>.$ (ap-call q.u.cug arg) =^ cam +>.$ (ap-call q.u.cug arg)
?^ cam (ap-lame q.u.cug u.cam) ?^ cam (ap-lame q.u.cug u.cam)