From 3f79f14af2726f4ffee7a87ea264279987df6a96 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 3 Nov 2019 20:39:50 -0600 Subject: [PATCH] factor: rename new-like* to new-like --- basis/sequences/product/product.factor | 4 ++-- basis/sequences/unrolled/unrolled.factor | 2 +- core/sequences/sequences.factor | 23 ++++++++++------------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/basis/sequences/product/product.factor b/basis/sequences/product/product.factor index d48901a68c..23ed03f409 100644 --- a/basis/sequences/product/product.factor +++ b/basis/sequences/product/product.factor @@ -65,7 +65,7 @@ M: product-sequence nth sequences product-length exemplar |[ result | sequences [ quot call i result set-nth-unsafe i 1 + i! ] product-each - ] new-like* ; inline + ] new-like ; inline : product-map ( ... sequences quot: ( ... seq -- ... value ) -- ... sequence ) over product-map-as ; inline @@ -75,4 +75,4 @@ M: product-sequence nth sequences product-length { } |[ result | sequences [ quot call 2array i result set-nth-unsafe i 1 + i! ] product-each - ] new-like* exemplar assoc-like ; inline + ] new-like exemplar assoc-like ; inline diff --git a/basis/sequences/unrolled/unrolled.factor b/basis/sequences/unrolled/unrolled.factor index b06d214d74..a3720f2f70 100644 --- a/basis/sequences/unrolled/unrolled.factor +++ b/basis/sequences/unrolled/unrolled.factor @@ -25,7 +25,7 @@ PRIVATE> (unrolled-collect) unrolled-each-integer ; inline : unrolled-map-integers ( n quot: ( n -- value ) exemplar -- newseq ) - overd [ unrolled-collect ] new-like* ; inline + overd [ unrolled-collect ] new-like ; inline ERROR: unrolled-bounds-error seq unroll-length ; diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 0217ac19c6..cd6cc2bd66 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -16,9 +16,6 @@ GENERIC: like ( seq exemplar -- newseq ) flushable GENERIC: clone-like ( seq exemplar -- newseq ) flushable : new-like ( len exemplar quot -- seq ) - over [ [ new-sequence ] dip call ] dip like ; inline - -: new-like* ( len exemplar quot -- seq ) over [ [ new-sequence ] dip [ call ] keepd ] dip like ; inline M: sequence like drop ; inline @@ -159,16 +156,16 @@ INSTANCE: iota immutable-sequence PRIVATE> : 1sequence ( obj exemplar -- seq ) - 1 swap [ (1sequence) ] new-like* ; inline + 1 swap [ (1sequence) ] new-like ; inline : 2sequence ( obj1 obj2 exemplar -- seq ) - 2 swap [ (2sequence) ] new-like* ; inline + 2 swap [ (2sequence) ] new-like ; inline : 3sequence ( obj1 obj2 obj3 exemplar -- seq ) - 3 swap [ (3sequence) ] new-like* ; inline + 3 swap [ (3sequence) ] new-like ; inline : 4sequence ( obj1 obj2 obj3 obj4 exemplar -- seq ) - 4 swap [ (4sequence) ] new-like* ; inline + 4 swap [ (4sequence) ] new-like ; inline : first2 ( seq -- first second ) 1 swap bounds-check nip first2-unsafe ; inline @@ -361,13 +358,13 @@ PRIVATE> : append-as ( seq1 seq2 exemplar -- newseq ) [ 2dup [ length ] bi@ + ] dip - [ (append) ] new-like* ; inline + [ (append) ] new-like ; inline : 3append-as ( seq1 seq2 seq3 exemplar -- newseq ) [ 3dup [ length ] tri@ + + ] dip [ [ [ 2over [ length ] bi@ + ] dip copy-unsafe ] [ (append) ] bi - ] new-like* ; inline + ] new-like ; inline : append ( seq1 seq2 -- newseq ) over append-as ; @@ -472,7 +469,7 @@ PRIVATE> swapd each ; inline : map-integers ( ... len quot: ( ... i -- ... elt ) exemplar -- ... newseq ) - overd [ collect ] new-like* ; inline + overd [ collect ] new-like ; inline : map-as ( ... seq quot: ( ... elt -- ... newelt ) exemplar -- ... newseq ) [ [ length ensure-integer ] keep ] 2dip @@ -480,7 +477,7 @@ PRIVATE> [ [ nth-unsafe ] curry ] [ compose [ keep ] curry ] [ [ set-nth-unsafe ] curry compose ] tri* each-integer - ] new-like* ; inline + ] new-like ; inline : map ( ... seq quot: ( ... elt -- ... newelt ) -- ... newseq ) over map-as ; inline @@ -768,13 +765,13 @@ PRIVATE> : prefix ( seq elt -- newseq ) over [ over length 1 + ] dip [ [ (1sequence) ] [ 1 swap copy-unsafe ] bi - ] new-like* ; + ] new-like ; : suffix ( seq elt -- newseq ) over [ over length 1 + ] dip [ [ [ over length ] dip set-nth-unsafe ] [ 0 swap copy-unsafe ] bi - ] new-like* ; + ] new-like ; : suffix! ( seq elt -- seq ) over push ; inline