move cords to sequences.cords

diff --git a/basis/cords/authors.txt b/basis/cords/authors.txt
deleted file mode 100644 (file)
index 1901f27..0000000
--- a/basis/cords/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Slava Pestov

diff --git a/basis/cords/cords-tests.factor b/basis/cords/cords-tests.factor
deleted file mode 100644 (file)
index 898e4e5..0000000
--- a/basis/cords/cords-tests.factor
+++ /dev/null
@@ -1,5 +0,0 @@
-USING: cords strings tools.test kernel sequences ;
-IN: cords.tests
-
-[ "hello world" ] [ "hello" " world" cord-append dup like ] unit-test
-[ "hello world" ] [ { "he" "llo" " world" } cord-concat dup like ] unit-test

diff --git a/basis/cords/cords.factor b/basis/cords/cords.factor
deleted file mode 100644 (file)
index ad17da9..0000000
--- a/basis/cords/cords.factor
+++ /dev/null
@@ -1,72 +0,0 @@
-! Copyright (C) 2008 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs sequences sorting binary-search math
-math.order arrays combinators kernel ;
-IN: cords
-
-<PRIVATE
-
-TUPLE: simple-cord
-    { first read-only } { second read-only } ;
-
-M: simple-cord length
-    [ first>> length ] [ second>> length ] bi + ; inline
-
-M: simple-cord virtual-exemplar first>> ; inline
-
-M: simple-cord virtual@
-    2dup first>> length <
-    [ first>> ] [ [ first>> length - ] [ second>> ] bi ] if ; inline
-
-TUPLE: multi-cord
-    { count read-only } { seqs read-only } ;
-
-M: multi-cord length count>> ; inline
-
-M: multi-cord virtual@
-    dupd
-    seqs>> [ first <=> ] with search nip
-    [ first - ] [ second ] bi ; inline
-
-M: multi-cord virtual-exemplar
-    seqs>> [ f ] [ first second ] if-empty ; inline
-
-: <cord> ( seqs -- cord )
-    dup length 2 = [
-        first2 simple-cord boa
-    ] [
-        [ 0 [ length + ] accumulate ] keep zip multi-cord boa
-    ] if ; inline
-
-PRIVATE>
-
-UNION: cord simple-cord multi-cord ;
-
-INSTANCE: cord virtual-sequence
-
-INSTANCE: multi-cord virtual-sequence
-
-: cord-append ( seq1 seq2 -- cord )
-    {
-        { [ over empty? ] [ nip ] }
-        { [ dup empty? ] [ drop ] }
-        { [ 2dup [ cord? ] both? ] [ [ seqs>> values ] bi@ append <cord> ] }
-        { [ over cord? ] [ [ seqs>> values ] dip suffix <cord> ] }
-        { [ dup cord? ] [ seqs>> values swap prefix <cord> ] }
-        [ 2array <cord> ]
-    } cond ; inline
-
-: cord-concat ( seqs -- cord )
-    {
-        { [ dup empty? ] [ drop f ] }
-        { [ dup length 1 = ] [ first ] }
-        [
-            [
-                {
-                    { [ dup cord? ] [ seqs>> values ] }
-                    { [ dup empty? ] [ drop { } ] }
-                    [ 1array ]
-                } cond
-            ] map concat <cord>
-        ]
-    } cond ; inline

diff --git a/basis/cords/summary.txt b/basis/cords/summary.txt
deleted file mode 100644 (file)
index 3c69862..0000000
--- a/basis/cords/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Virtual sequence concatenation

diff --git a/basis/cords/tags.txt b/basis/cords/tags.txt
deleted file mode 100644 (file)
index 42d711b..0000000
--- a/basis/cords/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-collections

diff --git a/basis/math/vectors/conversion/conversion.factor b/basis/math/vectors/conversion/conversion.factor
index 50bb9c8726eafd3f0702174885439e2062f4feb2..6148962ee0d5cc6dd5fc8808f1facd888196c4eb 100644 (file)
--- a/basis/math/vectors/conversion/conversion.factor
+++ b/basis/math/vectors/conversion/conversion.factor
@@ -1,8 +1,10 @@
 ! (c)Joe Groff bsd license
 USING: accessors alien.c-types arrays assocs classes combinators
-combinators.short-circuit cords fry kernel locals math
+combinators.short-circuit fry kernel locals math
 math.vectors math.vectors.simd math.vectors.simd.intrinsics sequences ;
-FROM: alien.c-types => char uchar short ushort int uint longlong ulonglong float double ;
+FROM: alien.c-types =>
+    char uchar short ushort int uint longlong ulonglong
+    float double ;
 IN: math.vectors.conversion
 
 ERROR: bad-vconvert from-type to-type ;

diff --git a/basis/math/vectors/simd/intrinsics/intrinsics.factor b/basis/math/vectors/simd/intrinsics/intrinsics.factor
index d2e0305fa3dc682850bc4253cd488606068766f7..30db6d5e135814745c9bfdadf6e5bbebdee2df57 100644 (file)
--- a/basis/math/vectors/simd/intrinsics/intrinsics.factor
+++ b/basis/math/vectors/simd/intrinsics/intrinsics.factor
@@ -1,8 +1,8 @@
 ! (c)2009 Slava Pestov, Joe Groff bsd license
 USING: accessors alien alien.c-types alien.data combinators
-cords cpu.architecture fry generalizations kernel libc locals
-math math.libm math.order math.ranges math.vectors sequences
-sequences.private specialized-arrays vocabs.loader ;
+sequences.cords cpu.architecture fry generalizations kernel
+libc locals math math.libm math.order math.ranges math.vectors
+sequences sequences.private specialized-arrays vocabs.loader ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAYS:
     c:char c:short c:int c:longlong

diff --git a/basis/sequences/cords/authors.txt b/basis/sequences/cords/authors.txt
new file mode 100644 (file)
index 0000000..1901f27
--- /dev/null
+++ b/basis/sequences/cords/authors.txt
@@ -0,0 +1 @@
+Slava Pestov

diff --git a/basis/sequences/cords/cords-tests.factor b/basis/sequences/cords/cords-tests.factor
new file mode 100644 (file)
index 0000000..2999365
--- /dev/null
+++ b/basis/sequences/cords/cords-tests.factor
@@ -0,0 +1,5 @@
+USING: sequences.cords strings tools.test kernel sequences ;
+IN: sequences.cords.tests
+
+[ "hello world" ] [ "hello" " world" cord-append dup like ] unit-test
+[ "hello world" ] [ { "he" "llo" " world" } cord-concat dup like ] unit-test

diff --git a/basis/sequences/cords/cords.factor b/basis/sequences/cords/cords.factor
new file mode 100644 (file)
index 0000000..4b88432
--- /dev/null
+++ b/basis/sequences/cords/cords.factor
@@ -0,0 +1,72 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors assocs sequences sorting binary-search math
+math.order arrays combinators kernel ;
+IN: sequences.cords
+
+<PRIVATE
+
+TUPLE: simple-cord
+    { first read-only } { second read-only } ;
+
+M: simple-cord length
+    [ first>> length ] [ second>> length ] bi + ; inline
+
+M: simple-cord virtual-exemplar first>> ; inline
+
+M: simple-cord virtual@
+    2dup first>> length <
+    [ first>> ] [ [ first>> length - ] [ second>> ] bi ] if ; inline
+
+TUPLE: multi-cord
+    { count read-only } { seqs read-only } ;
+
+M: multi-cord length count>> ; inline
+
+M: multi-cord virtual@
+    dupd
+    seqs>> [ first <=> ] with search nip
+    [ first - ] [ second ] bi ; inline
+
+M: multi-cord virtual-exemplar
+    seqs>> [ f ] [ first second ] if-empty ; inline
+
+: <cord> ( seqs -- cord )
+    dup length 2 = [
+        first2 simple-cord boa
+    ] [
+        [ 0 [ length + ] accumulate ] keep zip multi-cord boa
+    ] if ; inline
+
+PRIVATE>
+
+UNION: cord simple-cord multi-cord ;
+
+INSTANCE: cord virtual-sequence
+
+INSTANCE: multi-cord virtual-sequence
+
+: cord-append ( seq1 seq2 -- cord )
+    {
+        { [ over empty? ] [ nip ] }
+        { [ dup empty? ] [ drop ] }
+        { [ 2dup [ cord? ] both? ] [ [ seqs>> values ] bi@ append <cord> ] }
+        { [ over cord? ] [ [ seqs>> values ] dip suffix <cord> ] }
+        { [ dup cord? ] [ seqs>> values swap prefix <cord> ] }
+        [ 2array <cord> ]
+    } cond ; inline
+
+: cord-concat ( seqs -- cord )
+    {
+        { [ dup empty? ] [ drop f ] }
+        { [ dup length 1 = ] [ first ] }
+        [
+            [
+                {
+                    { [ dup cord? ] [ seqs>> values ] }
+                    { [ dup empty? ] [ drop { } ] }
+                    [ 1array ]
+                } cond
+            ] map concat <cord>
+        ]
+    } cond ; inline

diff --git a/basis/sequences/cords/summary.txt b/basis/sequences/cords/summary.txt
new file mode 100644 (file)
index 0000000..3c69862
--- /dev/null
+++ b/basis/sequences/cords/summary.txt
@@ -0,0 +1 @@
+Virtual sequence concatenation

diff --git a/basis/sequences/cords/tags.txt b/basis/sequences/cords/tags.txt
new file mode 100644 (file)
index 0000000..42d711b
--- /dev/null
+++ b/basis/sequences/cords/tags.txt
@@ -0,0 +1 @@
+collections