steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "sequences: simplify find-from and find-last-from." 

This reverts commit 903b8eec0b.
db4
John Benediktsson 2015-07-17 16:41:56 -07:00
parent cf0cec0ecd
commit 17386d0608
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/sequences/sequences.factor
View File

@ -422,9 +422,21 @@ PRIVATE>
: (find) ( seq quot quot' -- i elt )
pick [ [ (each) ] dip call ] dip finish-find ; inline
: (find-from) ( n seq quot quot' -- i elt )
[ 2dup bounds-check? ] 2dip
[ (find) ] 2curry
[ 2drop f f ]
if ; inline
: (find-index) ( seq quot quot' -- i elt )
pick [ [ (each-index) ] dip call ] dip finish-find ; inline
: (find-index-from) ( n seq quot quot' -- i elt )
[ 2dup bounds-check? ] 2dip
[ (find-index) ] 2curry
[ 2drop f f ]
if ; inline
: (accumulate) ( seq identity quot -- identity seq quot )
swapd [ curry keep ] curry ; inline
@ -494,19 +506,19 @@ PRIVATE>
[ pick ] dip swap 3map-as ; inline
: find-from ( ... n seq quot: ( ... elt -- ... ? ) -- ... i elt )
[ (find-integer) ] (find) ; inline
[ (find-integer) ] (find-from) ; inline
: find ( ... seq quot: ( ... elt -- ... ? ) -- ... i elt )
[ find-integer ] (find) ; inline
: find-last-from ( ... n seq quot: ( ... elt -- ... ? ) -- ... i elt )
[ nip find-last-integer ] (find) ; inline
[ nip find-last-integer ] (find-from) ; inline
: find-last ( ... seq quot: ( ... elt -- ... ? ) -- ... i elt )
[ [ 1 - ] dip find-last-integer ] (find) ; inline
: find-index-from ( ... n seq quot: ( ... elt i -- ... ? ) -- ... i elt )
[ (find-integer) ] (find-index) ; inline
[ (find-integer) ] (find-index-from) ; inline
: find-index ( ... seq quot: ( ... elt i -- ... ? ) -- ... i elt )
[ find-integer ] (find-index) ; inline