From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 16 Feb 2018 16:42:07 +0000 (-0800)
Subject: sequences.extras: rename join-with to interleaved.
X-Git-Tag: 0.98~290
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=a4dcc12b98180ee4364fed47c4658504484c49a6

sequences.extras: rename join-with to interleaved.
---

diff --git a/basis/english/english.factor b/basis/english/english.factor
index d5c696e8d7..48cf24bdf6 100644
--- a/basis/english/english.factor
+++ b/basis/english/english.factor
@@ -169,7 +169,7 @@ PRIVATE>
     dup singular? [ a/an ] [ drop "the" ] if ;
 
 : 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
     ] [ 2drop ] if ;
 
diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 4783342b71..fd020b6915 100644
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -632,11 +632,11 @@ PRIVATE>
     [ '[ @ not ] find drop ] 2keep drop swap
     [ 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 [ 2 * newseq set-nth-unsafe ] each-index
     seq length 1 - [ 2 * 1 + glue swap newseq set-nth-unsafe ] each-integer
     newseq ;
 
-: join-with ( seq glue -- newseq )
-    over join-with-as ;
+: interleaved ( seq glue -- newseq )
+    over interleaved-as ;