Merge branch 'philip/fix-uno' into philip/tomb

This commit is contained in:
Philip Monk 2022-03-25 18:11:11 -07:00
commit 07d01a0071
2 changed files with 4 additions and 5 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff89e2ff32d0dc0945c6b5ba376ebf637a35f213c5eda3d11cd49ede08a45485
size 9572384
oid sha256:7790b47edb009425d124aac10c95a40b587eefad19509f427cacd3c7ff9a8553
size 9692788

View File

@ -1453,7 +1453,6 @@
++ by :: map engine
~/ %by
=| a=(tree (pair)) :: (map)
=* node ?>(?=(^ a) n.a)
|@
++ all :: logical AND
~/ %all
@ -1717,14 +1716,14 @@
=+ b=a
|@
++ $
|= meg=$-([_p:node _q:node _q:node] _q:node)
|* meg=$-([* * *] *)
|- ^+ a
?~ b
a
?~ a
b
?: =(p.n.b p.n.a)
:+ [p.n.a (meg p.n.a q.n.a q.n.b)]
:+ [p.n.a `_?>(?=(^ a) q.n.a)`(meg p.n.a q.n.a q.n.b)]
$(b l.b, a l.a)
$(b r.b, a r.a)
?: (mor p.n.a p.n.b)