From 46f0aa64215131739b08c64ac3aa88f844a6c6a2 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 24 Nov 2009 22:56:42 -0800 Subject: [PATCH] move cords to sequences.cords --- basis/math/vectors/conversion/conversion.factor | 6 ++++-- basis/math/vectors/simd/intrinsics/intrinsics.factor | 6 +++--- basis/{ => sequences}/cords/authors.txt | 0 basis/{ => sequences}/cords/cords-tests.factor | 4 ++-- basis/{ => sequences}/cords/cords.factor | 2 +- basis/{ => sequences}/cords/summary.txt | 0 basis/{ => sequences}/cords/tags.txt | 0 7 files changed, 10 insertions(+), 8 deletions(-) rename basis/{ => sequences}/cords/authors.txt (100%) rename basis/{ => sequences}/cords/cords-tests.factor (62%) rename basis/{ => sequences}/cords/cords.factor (98%) rename basis/{ => sequences}/cords/summary.txt (100%) rename basis/{ => sequences}/cords/tags.txt (100%) diff --git a/basis/math/vectors/conversion/conversion.factor b/basis/math/vectors/conversion/conversion.factor index 50bb9c8726..6148962ee0 100644 --- 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 d2e0305fa3..30db6d5e13 100644 --- 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/cords/authors.txt b/basis/sequences/cords/authors.txt similarity index 100% rename from basis/cords/authors.txt rename to basis/sequences/cords/authors.txt diff --git a/basis/cords/cords-tests.factor b/basis/sequences/cords/cords-tests.factor similarity index 62% rename from basis/cords/cords-tests.factor rename to basis/sequences/cords/cords-tests.factor index 898e4e51c8..2999365926 100644 --- a/basis/cords/cords-tests.factor +++ b/basis/sequences/cords/cords-tests.factor @@ -1,5 +1,5 @@ -USING: cords strings tools.test kernel sequences ; -IN: cords.tests +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/cords/cords.factor b/basis/sequences/cords/cords.factor similarity index 98% rename from basis/cords/cords.factor rename to basis/sequences/cords/cords.factor index ad17da9652..4b88432313 100644 --- a/basis/cords/cords.factor +++ b/basis/sequences/cords/cords.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs sequences sorting binary-search math math.order arrays combinators kernel ; -IN: cords +IN: sequences.cords