Merge commit '450f0' into cc-merge

This commit is contained in:
C. Guy Yarvin 2016-11-13 16:54:44 -08:00
commit 04dad74b25

View File

@ -798,20 +798,15 @@
++ ta-ser :: reverse search ++ ta-ser :: reverse search
|= ext/(list @c) |= ext/(list @c)
^+ +> ^+ +>
?: |(?=($~ ris) =(0 pos.u.ris)) ta-bel ?: |(?=($~ ris) =(0 pos.u.ris))
ta-bel
=+ sop=?~(ext (dec pos.u.ris) pos.u.ris) =+ sop=?~(ext (dec pos.u.ris) pos.u.ris)
=+ tot=(weld str.u.ris ext) =+ tot=(weld str.u.ris ext)
=+ dol=(slag (sub num.hit sop) old.hit) =+ dol=(slag (sub num.hit sop) old.hit)
=+ ^= ser =/ sup
=+ ^= beg
|= {a/(list @c) b/(list @c)} ^- ?
?~(a & ?~(b | &(=(i.a i.b) $(a t.a, b t.b))))
|= {a/(list @c) b/(list @c)} ^- ?
?~(a & ?~(b | |((beg a b) $(b t.b))))
=+ ^= sup
|- ^- (unit @ud) |- ^- (unit @ud)
?~ dol ~ ?~ dol ~
?: (ser tot i.dol) ?^ (find tot i.dol)
`sop `sop
$(sop (dec sop), dol t.dol) $(sop (dec sop), dol t.dol)
?~ sup ta-bel ?~ sup ta-bel