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

sequences.extras: rename join-with to interleaved.

windows-high-dpi
John Benediktsson 2018-02-16 08:42:07 -08:00
parent 7203df0152
commit a4dcc12b98
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/english/english.factor
View File

@ -169,7 +169,7 @@ PRIVATE>
dup singular? [ a/an ] [ drop "the" ] if ; dup singular? [ a/an ] [ drop "the" ] if ;
: comma-list ( parts conjunction -- clause-seq ) : comma-list ( parts conjunction -- clause-seq )
[ ", " join-with ] dip over length dup 3 >= [ [ ", " interleaved ] dip over length dup 3 >= [
[ 3 > ", " " " ? " " surround ] [ 2 - pick set-nth ] bi [ 3 > ", " " " ? " " surround ] [ 2 - pick set-nth ] bi
] [ 2drop ] if ; ] [ 2drop ] if ;

6
extra/sequences/extras/extras.factor
View File

@ -632,11 +632,11 @@ PRIVATE>
[ '[ @ not ] find drop ] 2keep drop swap [ '[ @ not ] find drop ] 2keep drop swap
[ dup length ] unless* tail-slice ; inline [ dup length ] unless* tail-slice ; inline
:: join-with-as ( seq glue exemplar -- newseq ) :: interleaved-as ( seq glue exemplar -- newseq )
seq length dup 1 - + 0 max exemplar new-sequence :> newseq seq length dup 1 - + 0 max exemplar new-sequence :> newseq
seq [ 2 * newseq set-nth-unsafe ] each-index seq [ 2 * newseq set-nth-unsafe ] each-index
seq length 1 - [ 2 * 1 + glue swap newseq set-nth-unsafe ] each-integer seq length 1 - [ 2 * 1 + glue swap newseq set-nth-unsafe ] each-integer
newseq ; newseq ;
: join-with ( seq glue -- newseq ) : interleaved ( seq glue -- newseq )
over join-with-as ; over interleaved-as ;