From eb00ebd6ed63abb60fda6760c60e8868e4f90968 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 5 Feb 2023 13:29:58 -0600 Subject: [PATCH] sequences: seq-copy-loop -> copy-loop --- core/io/streams/sequence/sequence.factor | 2 +- core/sequences/sequences.factor | 4 ++-- core/sorting/sorting.factor | 4 ++-- extra/sequences/seq/seq.factor | 12 +----------- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/core/io/streams/sequence/sequence.factor b/core/io/streams/sequence/sequence.factor index bae13f6969..ee46d1bcc6 100644 --- a/core/io/streams/sequence/sequence.factor +++ b/core/io/streams/sequence/sequence.factor @@ -24,7 +24,7 @@ SLOT: i [ [ (sequence-read-length) ] [ [ dup pick + ] change-i underlying>> ] bi - ] dip [ -roll spin dupd + seq-copy-loop drop ] 3curry keep ; inline + ] dip [ -roll spin dupd + copy-loop drop ] 3curry keep ; inline : (sequence-read-unsafe) ( n buf stream -- count ) [ integer>fixnum ] diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index ce5d307dcb..352ba46007 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -364,14 +364,14 @@ C: copier : subseq-unsafe ( from to seq -- subseq ) dup subseq-unsafe-as ; inline -: seq-copy-loop ( dst dst-i src src-i src-stop -- dst ) +: copy-loop ( dst dst-i src src-i src-stop -- dst ) 2dup >= [ 4drop ] [ [ [ copy-nth-of-unsafe ] 4keep [ 1 + ] 2dip 1 + - ] dip seq-copy-loop + ] dip copy-loop ] if ; inline recursive PRIVATE> diff --git a/core/sorting/sorting.factor b/core/sorting/sorting.factor index 01b2d0e0f3..cc3cbfca43 100644 --- a/core/sorting/sorting.factor +++ b/core/sorting/sorting.factor @@ -37,14 +37,14 @@ TUPLE: merge-state [ [ to1>> ] [ from1>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ] [ seq>> ] [ from1>> roll dupd fixnum+fast ] tri - seq-copy-loop drop ; inline + copy-loop drop ; inline : dump-r ( merge -- ) [ accum>> ] keep [ [ to2>> ] [ from2>> fixnum-fast ] [ accum>> length integer>fixnum-strict ] tri [ fixnum+fast >>length ] 2keep ] [ seq>> ] [ from2>> roll dupd fixnum+fast ] tri - seq-copy-loop drop ; inline + copy-loop drop ; inline : l-next ( merge -- ) [ l-elt ] [ [ 1 + ] change-from1 accum>> ] bi push-unsafe ; inline diff --git a/extra/sequences/seq/seq.factor b/extra/sequences/seq/seq.factor index cd48133484..afce387f85 100644 --- a/extra/sequences/seq/seq.factor +++ b/extra/sequences/seq/seq.factor @@ -18,18 +18,8 @@ M: sequence seq-shorten 2dup lengthd > [ seq-set-length ] [ drop ] if ; inline : seq-grow-copy ( dst n -- dst dst-n ) [ over length + seq-lengthen ] keep 1 - ; inline -: seq-copy-loop ( dst dst-i src src-i src-stop -- dst ) - 2dup >= [ - 4drop - ] [ - [ - [ copy-nth-of-unsafe ] 4keep - [ 1 + ] 2dip 1 + - ] dip seq-copy-loop - ] if ; inline recursive - : seq-copy-unsafe ( dst dst-i src -- dst ) - 0 over length check-length seq-copy-loop ; inline + 0 over length check-length copy-loop ; inline : seq-push-all ( dst src -- dst ) [ length seq-grow-copy ] keep seq-copy-unsafe ; inline -- 2.34.1