Merge branch 'jb/nouncode' of https://github.com/urbit/ares into msl/nouncode

This commit is contained in:
Matthew LeVan 2024-08-14 14:39:10 -04:00
commit a91a919df9

View File

@ -984,9 +984,13 @@
$(tres [[now p %this b] tres], twig [%this a], pose [pole pose]) $(tres [[now p %this b] tres], twig [%this a], pose [pole pose])
:: ::
%both %both
=/ =pole [%mov p sass.twig] =^ l=$<(%none need) gen
=* l left.twig ?. ?=(%none -.left.twig) [left.twig gen]
=* r rite.twig =^(r gen rain [[%this r] gen])
=^ r=$<(%none need) gen
?. ?=(%none -.rite.twig) [rite.twig gen]
=^(r gen rain [[%this r] gen])
=/ =pole [%con +:(sass l) +:(sass r) sass.twig]
=+ [a b]=?:(?=(%2 now) [l r] [r l]) =+ [a b]=?:(?=(%2 now) [l r] [r l])
$(tres [[now p b] tres], twig a, pose [pole pose]) $(tres [[now p b] tres], twig a, pose [pole pose])
:: ::
@ -1018,12 +1022,9 @@
$(todo [pole todo], tack t.tack) $(todo [pole todo], tack t.tack)
:: ::
%both %both
%= $ =^ [y=@uwoo r=@uvre] gen (kerf [%next ne u])
tack =/ =pole ?~(no [%poi r] [%imm u.no r])
?: ?=(?(~ [~ @]) no) $(u y, todo [pole todo], tack t.tack)
[[~ rite.ne] [~ left.ne] t.tack]
[[`+.u.no rite.ne] [`-.u.no left.ne] t.tack]
==
:: ::
%none $(tack t.tack) %none $(tack t.tack)
== ==