From 6946bf274cc264c5dbce5a7a4a3c71ab76a8f9aa Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 23 Jul 2022 22:17:51 -0500 Subject: [PATCH] core: fix naming of sequence-index-operator iterator just sets up indices/nth, operator also composes the quotation --- core/sequences/sequences.factor | 6 +++--- extra/sequences/extras/extras.factor | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 1041d9c9b7..bf305082f1 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -424,7 +424,7 @@ PRIVATE> : collect ( n quot into -- ) [ [ keep ] dip set-nth-unsafe ] 2curry each-integer ; inline -: sequence-index-iterator ( seq quot -- n quot' ) +: sequence-index-operator ( seq quot -- n quot' ) [ length-iterator [ keep ] curry ] dip compose ; inline : map-into ( seq quot into -- ) @@ -460,7 +460,7 @@ PRIVATE> '[ _ _ (find) ] [ 2drop f f ] if ; inline : (find-index) ( seq quot quot' -- i elt ) - pick [ [ sequence-index-iterator ] dip call ] dip finish-find ; inline + pick [ [ sequence-index-operator ] dip call ] dip finish-find ; inline : (find-index-from) ( n seq quot quot' -- i elt ) [ 2dup bounds-check? ] 2dip @@ -635,7 +635,7 @@ PRIVATE> [ dup ] swap [ keep ] curry produce nip ; inline : each-index ( ... seq quot: ( ... elt index -- ... ) -- ... ) - sequence-index-iterator each-integer ; inline + sequence-index-operator each-integer ; inline : map-index-as ( ... seq quot: ( ... elt index -- ... newelt ) exemplar -- ... newseq ) [ dup length ] 2dip 2map-as ; inline diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor index 78793771b7..81bf964762 100644 --- a/extra/sequences/extras/extras.factor +++ b/extra/sequences/extras/extras.factor @@ -382,7 +382,7 @@ PRIVATE> ] [ 3drop f ] if ; inline : map-index! ( ... seq quot: ( ... elt index -- ... newelt ) -- ... seq ) - over [ [ sequence-index-iterator ] dip collect ] keep ; inline + over [ [ sequence-index-operator ] dip collect ] keep ; inline [ length 1 - swap - ] [ nth ] bi ; inline : each-index-from ( ... seq quot: ( ... elt index -- ... ) i -- ... ) - -rot sequence-index-iterator each-integer-from ; inline + -rot sequence-index-operator each-integer-from ; inline