From 2a9e722c4376aa56a651f4aa068b41565469cb33 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 20 Mar 2021 08:50:40 -0700 Subject: [PATCH] sequences.extras: remove map-zip in favor of assocs:zip-with. --- extra/sequences/extras/extras-tests.factor | 13 +------------ extra/sequences/extras/extras.factor | 5 +---- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/extra/sequences/extras/extras-tests.factor b/extra/sequences/extras/extras-tests.factor index c920776332..769af29bdc 100644 --- a/extra/sequences/extras/extras-tests.factor +++ b/extra/sequences/extras/extras-tests.factor @@ -242,17 +242,6 @@ tools.test vectors vocabs ; { 120000 } [ { 10 20 30 40 50 60 } 1 [ * ] 3 reduce-from ] unit-test -{ - { - { 2 4 } - { 3 6 } - { 4 8 } - } -} [ { 2 3 4 } [ 2 * ] map-zip ] unit-test - -{ } -[ "test:" all-words [ name>> over prepend ] map-zip 2drop ] unit-test - { { 0 1 2 3 } } [ 8 [ 4 < ] take-while >array ] unit-test { { } } [ { 15 16 } [ 4 < ] take-while >array ] unit-test { { 0 1 2 } } [ 3 [ 4 < ] take-while >array ] unit-test @@ -281,4 +270,4 @@ tools.test vectors vocabs ; { SBUF" aco" SBUF" ftr" } [ SBUF" factor" dup [ even? ] extract! ] unit-test { 25 5 1 } [ { 4 5 6 } [ sq ] [ 20 > ] find-pred ] unit-test -{ f f f } [ { 4 5 6 } [ sq ] [ 200 > ] find-pred ] unit-test \ No newline at end of file +{ f f f } [ { 4 5 6 } [ sq ] [ 200 > ] find-pred ] unit-test diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor index 5589c8caec..929354d138 100644 --- a/extra/sequences/extras/extras.factor +++ b/extra/sequences/extras/extras.factor @@ -616,10 +616,7 @@ PRIVATE> : count-subseq* ( subseq seq -- n ) start-all* length ; inline -: map-zip ( quot: ( key -- value ) -- alist ) - '[ _ keep swap ] map>alist ; inline - -: assoc-map-zip ( quot: ( key value -- calc ) -- alist ) +: assoc-zip-with ( quot: ( key value -- calc ) -- alist ) '[ _ 2keep 2array swap ] assoc-map ; inline : take-while ( ... seq quot: ( ... elt -- ... ? ) -- head-slice ) -- 2.34.1