From 0ba5304ee387b867519fdc3550029bfcb6c95506 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Wed, 3 Dec 2008 03:44:08 -0600 Subject: [PATCH] Fix assocs, generic.standard tests --- core/assocs/assocs-tests.factor | 4 ++-- core/generic/standard/standard-tests.factor | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/assocs/assocs-tests.factor b/core/assocs/assocs-tests.factor index 3deb08ac62..969c7249a9 100644 --- a/core/assocs/assocs-tests.factor +++ b/core/assocs/assocs-tests.factor @@ -1,7 +1,7 @@ IN: assocs.tests USING: kernel math namespaces make tools.test vectors sequences sequences.private hashtables io prettyprint assocs -continuations float-arrays ; +continuations specialized-arrays.double ; [ t ] [ H{ } dup assoc-subset? ] unit-test [ f ] [ H{ { 1 3 } } H{ } assoc-subset? ] unit-test @@ -91,7 +91,7 @@ unit-test [ H{ { 1.0 1.0 } { 2.0 2.0 } } ] [ - F{ 1.0 2.0 } [ dup ] H{ } map>assoc + double-array{ 1.0 2.0 } [ dup ] H{ } map>assoc ] unit-test [ { 3 } ] [ diff --git a/core/generic/standard/standard-tests.factor b/core/generic/standard/standard-tests.factor index 7dadc807fd..f5f8f85376 100644 --- a/core/generic/standard/standard-tests.factor +++ b/core/generic/standard/standard-tests.factor @@ -1,10 +1,10 @@ IN: generic.standard.tests USING: tools.test math math.functions math.constants -generic.standard strings sequences arrays kernel accessors -words float-arrays byte-arrays bit-arrays parser namespaces make -quotations stack-checker vectors growable hashtables sbufs -prettyprint byte-vectors bit-vectors float-vectors definitions -generic sets graphs assocs ; +generic.standard strings sequences arrays kernel accessors words +specialized-arrays.double byte-arrays bit-arrays parser +namespaces make quotations stack-checker vectors growable +hashtables sbufs prettyprint byte-vectors bit-vectors +specialized-vectors.double definitions generic sets graphs assocs ; GENERIC: lo-tag-test ( obj -- obj' ) @@ -110,14 +110,14 @@ M: circle big-mix-test drop "circle" ; [ "integer" ] [ 3 big-mix-test ] unit-test [ "float" ] [ 5.0 big-mix-test ] unit-test [ "complex" ] [ -1 sqrt big-mix-test ] unit-test -[ "sequence" ] [ F{ 1.0 2.0 3.0 } big-mix-test ] unit-test +[ "sequence" ] [ double-array{ 1.0 2.0 3.0 } big-mix-test ] unit-test [ "sequence" ] [ B{ 1 2 3 } big-mix-test ] unit-test [ "sequence" ] [ ?{ t f t } big-mix-test ] unit-test [ "sequence" ] [ SBUF" hello world" big-mix-test ] unit-test [ "sequence" ] [ V{ "a" "b" } big-mix-test ] unit-test [ "sequence" ] [ BV{ 1 2 } big-mix-test ] unit-test [ "sequence" ] [ ?V{ t t f f } big-mix-test ] unit-test -[ "sequence" ] [ FV{ -0.3 4.6 } big-mix-test ] unit-test +[ "sequence" ] [ double-vector{ -0.3 4.6 } big-mix-test ] unit-test [ "string" ] [ "hello" big-mix-test ] unit-test [ "rectangle" ] [ 1 2 big-mix-test ] unit-test [ "parallelogram" ] [ 10 4 3 big-mix-test ] unit-test @@ -133,13 +133,13 @@ M: string small-lo-tag drop "string" ; M: array small-lo-tag drop "array" ; -M: float-array small-lo-tag drop "float-array" ; +M: double-array small-lo-tag drop "double-array" ; M: byte-array small-lo-tag drop "byte-array" ; [ "fixnum" ] [ 3 small-lo-tag ] unit-test -[ "float-array" ] [ F{ 1.0 } small-lo-tag ] unit-test +[ "double-array" ] [ double-array{ 1.0 } small-lo-tag ] unit-test ! Testing next-method TUPLE: person ;