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

Clean up trim-{head,tail}{,-slice} combinators

db4
Slava Pestov 2009-02-04 00:51:00 -06:00
parent e1260031b6
commit f5c7beb75a
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/sequences/sequences.factor
View File

@ -822,25 +822,35 @@ PRIVATE>
dup slice? [ { } like ] when 0 over length rot <slice> ; dup slice? [ { } like ] when 0 over length rot <slice> ;
inline inline
: trim-head-slice ( seq quot -- slice ) <PRIVATE
over [ [ not ] compose find drop ] dip swap
[ tail-slice ] [ dup length tail-slice ] if* ; inline
: (trim-head) ( seq quot -- seq n )
over [ [ not ] compose find drop ] dip
[ length or ] keep swap ; inline
: (trim-tail) ( seq quot -- seq n )
over [ [ not ] compose find-last drop ?1+ ] dip
swap ; inline
PRIVATE>
: trim-head-slice ( seq quot -- slice )
(trim-head) tail-slice ; inline
: trim-head ( seq quot -- newseq ) : trim-head ( seq quot -- newseq )
over [ trim-head-slice ] dip like ; inline (trim-head) tail ; inline
: trim-tail-slice ( seq quot -- slice ) : trim-tail-slice ( seq quot -- slice )
over [ [ not ] compose find-last drop ] dip swap (trim-tail) head-slice ; inline
[ 1+ head-slice ] [ 0 head-slice ] if* ; inline
: trim-tail ( seq quot -- newseq ) : trim-tail ( seq quot -- newseq )
over [ trim-tail-slice ] dip like ; inline (trim-tail) head ; inline
: trim-slice ( seq quot -- slice ) : trim-slice ( seq quot -- slice )
[ trim-head-slice ] [ trim-tail-slice ] bi ; inline [ trim-head-slice ] [ trim-tail-slice ] bi ; inline
: trim ( seq quot -- newseq ) : trim ( seq quot -- newseq )
over [ trim-slice ] dip like ; inline [ trim-slice ] [ drop ] 2bi like ; inline
: sum ( seq -- n ) 0 [ + ] binary-reduce ; : sum ( seq -- n ) 0 [ + ] binary-reduce ;