From fafd00bae7f2d1354366395f7f014004d5f55c97 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 13 Apr 2008 12:54:58 -0500 Subject: [PATCH] rename new -> new-sequence --- core/arrays/arrays.factor | 4 ++-- core/bit-arrays/bit-arrays.factor | 2 +- core/bit-vectors/bit-vectors.factor | 2 +- core/bootstrap/compiler/compiler.factor | 2 +- core/byte-arrays/byte-arrays.factor | 2 +- core/byte-vectors/byte-vectors.factor | 2 +- core/float-arrays/float-arrays.factor | 2 +- core/float-vectors/float-vectors.factor | 2 +- core/sbufs/sbufs.factor | 2 +- core/sequences/sequences-docs.factor | 4 ++-- core/sequences/sequences.factor | 10 +++++----- core/strings/strings.factor | 2 +- core/vectors/vectors.factor | 2 +- extra/sequences/next/next.factor | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/arrays/arrays.factor b/core/arrays/arrays.factor index 414c64581e..9c5f40d883 100755 --- a/core/arrays/arrays.factor +++ b/core/arrays/arrays.factor @@ -12,9 +12,9 @@ M: array resize resize-array ; : >array ( seq -- array ) { } clone-like ; -M: object new drop f ; +M: object new-sequence drop f ; -M: f new drop dup zero? [ drop f ] [ f ] if ; +M: f new-sequence drop dup zero? [ drop f ] [ f ] if ; M: array like drop dup array? [ >array ] unless ; diff --git a/core/bit-arrays/bit-arrays.factor b/core/bit-arrays/bit-arrays.factor index ee485d399e..ffb9f5d195 100755 --- a/core/bit-arrays/bit-arrays.factor +++ b/core/bit-arrays/bit-arrays.factor @@ -43,7 +43,7 @@ M: bit-array clone (clone) ; M: bit-array like drop dup bit-array? [ >bit-array ] unless ; -M: bit-array new drop ; +M: bit-array new-sequence drop ; M: bit-array equal? over bit-array? [ sequence= ] [ 2drop f ] if ; diff --git a/core/bit-vectors/bit-vectors.factor b/core/bit-vectors/bit-vectors.factor index c418a24813..3949dc2632 100755 --- a/core/bit-vectors/bit-vectors.factor +++ b/core/bit-vectors/bit-vectors.factor @@ -22,7 +22,7 @@ M: bit-vector like [ dup length bit-array>vector ] [ >bit-vector ] if ] unless ; -M: bit-vector new +M: bit-vector new-sequence drop [ ] keep >fixnum bit-array>vector ; M: bit-vector equal? diff --git a/core/bootstrap/compiler/compiler.factor b/core/bootstrap/compiler/compiler.factor index 9e101126e6..da3c634ebd 100755 --- a/core/bootstrap/compiler/compiler.factor +++ b/core/bootstrap/compiler/compiler.factor @@ -53,7 +53,7 @@ nl "." write flush { - new nth push pop peek + new-sequence nth push pop peek } compile "." write flush diff --git a/core/byte-arrays/byte-arrays.factor b/core/byte-arrays/byte-arrays.factor index 548c293e7c..d603470810 100755 --- a/core/byte-arrays/byte-arrays.factor +++ b/core/byte-arrays/byte-arrays.factor @@ -10,7 +10,7 @@ M: byte-array nth-unsafe swap >fixnum alien-unsigned-1 ; M: byte-array set-nth-unsafe swap >fixnum set-alien-unsigned-1 ; : >byte-array ( seq -- byte-array ) B{ } clone-like ; inline M: byte-array like drop dup byte-array? [ >byte-array ] unless ; -M: byte-array new drop ; +M: byte-array new-sequence drop ; M: byte-array equal? over byte-array? [ sequence= ] [ 2drop f ] if ; diff --git a/core/byte-vectors/byte-vectors.factor b/core/byte-vectors/byte-vectors.factor index 6a08f657a2..9a0185319f 100755 --- a/core/byte-vectors/byte-vectors.factor +++ b/core/byte-vectors/byte-vectors.factor @@ -22,7 +22,7 @@ M: byte-vector like [ dup length byte-array>vector ] [ >byte-vector ] if ] unless ; -M: byte-vector new +M: byte-vector new-sequence drop [ ] keep >fixnum byte-array>vector ; M: byte-vector equal? diff --git a/core/float-arrays/float-arrays.factor b/core/float-arrays/float-arrays.factor index 33302572de..d25d447a46 100755 --- a/core/float-arrays/float-arrays.factor +++ b/core/float-arrays/float-arrays.factor @@ -24,7 +24,7 @@ M: float-array set-nth-unsafe M: float-array like drop dup float-array? [ >float-array ] unless ; -M: float-array new drop 0.0 ; +M: float-array new-sequence drop 0.0 ; M: float-array equal? over float-array? [ sequence= ] [ 2drop f ] if ; diff --git a/core/float-vectors/float-vectors.factor b/core/float-vectors/float-vectors.factor index 2b023985a4..11535e349e 100755 --- a/core/float-vectors/float-vectors.factor +++ b/core/float-vectors/float-vectors.factor @@ -22,7 +22,7 @@ M: float-vector like [ dup length float-array>vector ] [ >float-vector ] if ] unless ; -M: float-vector new +M: float-vector new-sequence drop [ 0.0 ] keep >fixnum float-array>vector ; M: float-vector equal? diff --git a/core/sbufs/sbufs.factor b/core/sbufs/sbufs.factor index 9de57c0801..69cbad2cd3 100755 --- a/core/sbufs/sbufs.factor +++ b/core/sbufs/sbufs.factor @@ -16,7 +16,7 @@ PRIVATE> M: sbuf set-nth-unsafe underlying >r >r >fixnum r> >fixnum r> set-string-nth ; -M: sbuf new drop [ 0 ] keep >fixnum string>sbuf ; +M: sbuf new-sequence drop [ 0 ] keep >fixnum string>sbuf ; : >sbuf ( seq -- sbuf ) SBUF" " clone-like ; inline diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor index 473aa03d7a..b7ad22996f 100755 --- a/core/sequences/sequences-docs.factor +++ b/core/sequences/sequences-docs.factor @@ -33,7 +33,7 @@ ARTICLE: "sequence-protocol" "Sequence protocol" "An optional generic word for creating sequences of the same class as a given sequence:" { $subsection like } "Optional generic words for optimization purposes:" -{ $subsection new } +{ $subsection new-sequence } { $subsection new-resizable } { $see-also "sequences-unsafe" } ; @@ -281,7 +281,7 @@ HELP: immutable { $description "Throws an " { $link immutable } " error." } { $error-description "Thrown if an attempt is made to modify an immutable sequence." } ; -HELP: new +HELP: new-sequence { $values { "len" "a non-negative integer" } { "seq" sequence } { "newseq" "a mutable sequence" } } { $contract "Outputs a mutable sequence of length " { $snippet "n" } " which can hold the elements of " { $snippet "seq" } "." } ; diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 996aba8e6e..7061ac3933 100755 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -9,13 +9,13 @@ GENERIC: length ( seq -- n ) flushable GENERIC: set-length ( n seq -- ) GENERIC: nth ( n seq -- elt ) flushable GENERIC: set-nth ( elt n seq -- ) -GENERIC: new ( len seq -- newseq ) flushable +GENERIC: new-sequence ( len seq -- newseq ) flushable GENERIC: new-resizable ( len seq -- newseq ) flushable GENERIC: like ( seq exemplar -- newseq ) flushable GENERIC: clone-like ( seq exemplar -- newseq ) flushable : new-like ( len exemplar quot -- seq ) - over >r >r new r> call r> like ; inline + over >r >r new-sequence r> call r> like ; inline M: sequence like drop ; @@ -162,7 +162,7 @@ M: virtual-sequence set-nth virtual@ set-nth ; M: virtual-sequence nth-unsafe virtual@ nth-unsafe ; M: virtual-sequence set-nth-unsafe virtual@ set-nth-unsafe ; M: virtual-sequence like virtual-seq like ; -M: virtual-sequence new virtual-seq new ; +M: virtual-sequence new-sequence virtual-seq new-sequence ; INSTANCE: virtual-sequence sequence @@ -250,7 +250,7 @@ INSTANCE: repetition immutable-sequence dup 0 <= [ 2drop 2drop ] [ 1- ((copy)) (copy) ] if ; inline : prepare-subseq ( from to seq -- dst i src j n ) - [ >r swap - r> new dup 0 ] 3keep + [ >r swap - r> new-sequence dup 0 ] 3keep -rot drop roll length ; inline : check-copy ( src n dst -- ) @@ -275,7 +275,7 @@ PRIVATE> (copy) drop ; inline M: sequence clone-like - >r dup length r> new [ 0 swap copy ] keep ; + >r dup length r> new-sequence [ 0 swap copy ] keep ; M: immutable-sequence clone-like like ; diff --git a/core/strings/strings.factor b/core/strings/strings.factor index bb3c94ce97..1484737277 100755 --- a/core/strings/strings.factor +++ b/core/strings/strings.factor @@ -46,6 +46,6 @@ M: string resize resize-string ; : >string ( seq -- str ) "" clone-like ; -M: string new drop 0 ; +M: string new-sequence drop 0 ; INSTANCE: string sequence diff --git a/core/vectors/vectors.factor b/core/vectors/vectors.factor index 1820c62ff4..aa827fd726 100755 --- a/core/vectors/vectors.factor +++ b/core/vectors/vectors.factor @@ -19,7 +19,7 @@ M: vector like dup array? [ dup length array>vector ] [ >vector ] if ] unless ; -M: vector new drop [ f ] keep >fixnum array>vector ; +M: vector new-sequence drop [ f ] keep >fixnum array>vector ; M: vector equal? over vector? [ sequence= ] [ 2drop f ] if ; diff --git a/extra/sequences/next/next.factor b/extra/sequences/next/next.factor index 5919fb0701..b22bf2683c 100755 --- a/extra/sequences/next/next.factor +++ b/extra/sequences/next/next.factor @@ -17,6 +17,6 @@ PRIVATE> : map-next ( seq quot -- newseq ) ! quot: next-elt elt -- newelt - over dup length swap new >r + over dup length swap new-sequence >r iterate-seq [ (map-next) ] 2curry r> [ collect ] keep ; inline