10. updates %5 to require two subformulas (4K)

This commit is contained in:
Joe Bryan 2018-10-10 20:20:45 -04:00
parent f16f052401
commit 6e2e6b001f
3 changed files with 17 additions and 13 deletions

View File

@ -1 +1 @@
https://ci-piers.urbit.org/zod-48d67779df5eeaf1353f22f9cc75177e37077f7e.tgz https://ci-piers.urbit.org/zod-f16f052401977e9d0483fc2b3830cbce9ab6a851.tgz

View File

@ -1 +1 @@
147941ba0774eb0c09ee7a5b79cbc2a1b0bbc7ea 7507de1e6c2eec01a8d2fb41e8895864cbc26ede

View File

@ -5994,11 +5994,12 @@
?. ?=(@ p.ben) [%2 tax] ?. ?=(@ p.ben) [%2 tax]
[%0 .+(p.ben)] [%0 .+(p.ben)]
:: ::
{$5 b/*} {$5 b/* c/*}
=+ ben=$(fol b.fol) =+ hed=$(fol b.fol)
?. ?=($0 -.ben) ben ?. ?=($0 -.hed) hed
?. ?=(^ p.ben) [%2 tax] =+ tal=$(fol c.fol)
[%0 =(-.p.ben +.p.ben)] ?. ?=($0 -.tal) tal
[%0 =(p.hed p.tal)]
:: ::
{$6 b/* c/* d/*} {$6 b/* c/* d/*}
$(fol =>(fol [2 [0 1] 2 [1 c d] [1 0] 2 [1 2 3] [1 0] 4 4 b])) $(fol =>(fol [2 [0 1] 2 [1 c d] [1 0] 2 [1 2 3] [1 0] 4 4 b]))
@ -6705,15 +6706,18 @@
:: ::
:: 5; compare :: 5; compare
:: ::
{$5 b/*} {$5 b/* c/*}
%+ require %+ require
$(fol b.fol) $(fol b.fol)
|= :: fig: operator input |= :: hed: left input
:: ::
fig/noun hed/noun
:: stop for atoms, compare cells %+ require
^$(fol c.fol)
|= :: tal: right input
:: ::
?@(fig ~ [full/~ =(-.fig +.fig)]) tal/noun
[full/~ =(hed tal)]
:: ::
:: 6; if-then-else :: 6; if-then-else
:: ::