From 962b7899f28c8f4a5ee33f2a3b3c731dd76dd6b8 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 25 Jan 2022 10:04:06 -0800 Subject: [PATCH] sequences: rename slow-each to map-each --- core/sequences/sequences.factor | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index f090543020..4878f582a8 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -397,17 +397,6 @@ PRIVATE> > ] [ to>> ] [ seq>> ] tri @@ -433,8 +422,17 @@ PRIVATE> : collect ( n quot into -- ) (collect) each-integer ; inline +: setup-map-each ( seq -- n quot ) + [ length check-length ] keep [ nth-unsafe ] curry ; inline + +: (map-each) ( seq quot -- n quot' ) + [ setup-map-each ] dip compose ; inline + +: (map-each-index) ( seq quot -- n quot' ) + [ setup-map-each [ keep ] curry ] dip compose ; inline + : map-into ( seq quot into -- ) - [ (slow-each) ] dip collect ; inline + [ (map-each) ] dip collect ; inline : 2nth-unsafe ( n seq1 seq2 -- elt1 elt2 ) [ nth-unsafe ] bi-curry@ bi ; inline @@ -459,7 +457,7 @@ PRIVATE> over [ dupd nth-unsafe ] [ drop f ] if ; inline : (find) ( seq quot quot' -- i elt ) - pick [ [ (slow-each) ] dip call ] dip finish-find ; inline + pick [ [ (map-each) ] dip call ] dip finish-find ; inline : (find-from) ( n seq quot quot' -- i elt ) [ 2dup bounds-check? ] 2dip @@ -468,7 +466,7 @@ PRIVATE> if ; inline : (find-index) ( seq quot quot' -- i elt ) - pick [ [ (slow-each-index) ] dip call ] dip finish-find ; inline + pick [ [ (map-each-index) ] dip call ] dip finish-find ; inline : (find-index-from) ( n seq quot quot' -- i elt ) [ 2dup bounds-check? ] 2dip @@ -497,7 +495,7 @@ PRIVATE> overd [ [ collect ] keep ] new-like ; inline : map-as ( ... seq quot: ( ... elt -- ... newelt ) exemplar -- ... newseq ) - [ (slow-each) ] dip map-integers ; inline + [ (map-each) ] dip map-integers ; inline : map ( ... seq quot: ( ... elt -- ... newelt ) -- ... newseq ) over map-as ; inline -- 2.34.1