fix some unit-test syntax to use array instead of quotation for result

diff --git a/basis/compiler/tests/call-effect.factor b/basis/compiler/tests/call-effect.factor
index f90897bc9bd34c4e1b5e682972f0cdc702838c43..7df5fd6c10abc4ee0bb2b25311b4ee713567b274 100644 (file)
--- a/basis/compiler/tests/call-effect.factor
+++ b/basis/compiler/tests/call-effect.factor
@@ -8,7 +8,7 @@ IN: compiler.tests.call-effect
 
 : call-test ( q -- ) call( -- ) ;
 
-[ ] [ [ ] call-test ] unit-test
-[ ] [ f [ drop ] curry call-test ] unit-test
-[ ] [ [ ] [ ] compose call-test ] unit-test
+{ } [ [ ] call-test ] unit-test
+{ } [ f [ drop ] curry call-test ] unit-test
+{ } [ [ ] [ ] compose call-test ] unit-test
 [ [ 1 2 3 ] call-test ] [ wrong-values? ] must-fail-with

diff --git a/basis/compiler/tests/curry.factor b/basis/compiler/tests/curry.factor
index 1bf5e052d9a7bafccc60458d4a1a977da29e4dbf..b1cea9b754b1f84a6943aa8bd0ee137400a7b4b5 100644 (file)
--- a/basis/compiler/tests/curry.factor
+++ b/basis/compiler/tests/curry.factor
@@ -3,31 +3,29 @@ assocs namespaces make compiler.units compiler.test
 locals random ;
 IN: compiler.tests.curry
 
-[ 3 ] [ 5 [ [ 2 - ] curry call ] compile-call ] unit-test
-[ 3 ] [ [ 5 [ 2 - ] curry call ] compile-call ] unit-test
-[ 3 ] [ [ 5 2 [ - ] 2curry call ] compile-call ] unit-test
-[ 3 ] [ 5 [ 2 [ - ] 2curry call ] compile-call ] unit-test
-[ 3 ] [ 5 2 [ [ - ] 2curry call ] compile-call ] unit-test
-[ 3 ] [ 5 2 [ [ - ] 2curry 9 swap call /i ] compile-call ] unit-test
-[ 3 ] [ 5 2 [ [ - ] 2curry [ 9 ] dip call /i ] compile-call ] unit-test
-
-[ -10 -20 ] [ 10 20 -1 [ [ * ] curry bi@ ] compile-call ] unit-test
-
-[ [ 5 2 - ] ] [ 5 [ [ 2 - ] curry ] compile-call >quotation ] unit-test
-[ [ 5 2 - ] ] [ [ 5 [ 2 - ] curry ] compile-call >quotation ] unit-test
-[ [ 5 2 - ] ] [ [ 5 2 [ - ] 2curry ] compile-call >quotation ] unit-test
-[ [ 5 2 - ] ] [ 5 [ 2 [ - ] 2curry ] compile-call >quotation ] unit-test
-[ [ 5 2 - ] ] [ 5 2 [ [ - ] 2curry ] compile-call >quotation ] unit-test
-
-[ [ 6 2 + ] ]
-[
+{ 3 } [ 5 [ [ 2 - ] curry call ] compile-call ] unit-test
+{ 3 } [ [ 5 [ 2 - ] curry call ] compile-call ] unit-test
+{ 3 } [ [ 5 2 [ - ] 2curry call ] compile-call ] unit-test
+{ 3 } [ 5 [ 2 [ - ] 2curry call ] compile-call ] unit-test
+{ 3 } [ 5 2 [ [ - ] 2curry call ] compile-call ] unit-test
+{ 3 } [ 5 2 [ [ - ] 2curry 9 swap call /i ] compile-call ] unit-test
+{ 3 } [ 5 2 [ [ - ] 2curry [ 9 ] dip call /i ] compile-call ] unit-test
+
+{ -10 -20 } [ 10 20 -1 [ [ * ] curry bi@ ] compile-call ] unit-test
+
+{ [ 5 2 - ] } [ 5 [ [ 2 - ] curry ] compile-call >quotation ] unit-test
+{ [ 5 2 - ] } [ [ 5 [ 2 - ] curry ] compile-call >quotation ] unit-test
+{ [ 5 2 - ] } [ [ 5 2 [ - ] 2curry ] compile-call >quotation ] unit-test
+{ [ 5 2 - ] } [ 5 [ 2 [ - ] 2curry ] compile-call >quotation ] unit-test
+{ [ 5 2 - ] } [ 5 2 [ [ - ] 2curry ] compile-call >quotation ] unit-test
+
+{ [ 6 2 + ] } [
     2 5
     [ [ [ + ] curry ] dip 0 < [ -2 ] [ 6 ] if swap curry ]
     compile-call >quotation
 ] unit-test
 
-[ 8 ]
-[
+{ 8 } [
     2 5
     [ [ [ + ] curry ] dip 0 < [ -2 ] [ 6 ] if swap curry call ]
     compile-call
@@ -36,28 +34,28 @@ IN: compiler.tests.curry
 : foobar ( quot: ( ..a -- ..b ) -- )
     [ call ] keep swap [ foobar ] [ drop ] if ; inline recursive
 
-[ ] [ [ [ f ] foobar ] compile-call ] unit-test
+{ } [ [ [ f ] foobar ] compile-call ] unit-test
 
-[ { 6 7 8 } ] [ { 1 2 3 } 5 [ [ + ] curry map ] compile-call ] unit-test
-[ { 6 7 8 } ] [ { 1 2 3 } [ 5 [ + ] curry map ] compile-call ] unit-test
+{ { 6 7 8 } } [ { 1 2 3 } 5 [ [ + ] curry map ] compile-call ] unit-test
+{ { 6 7 8 } } [ { 1 2 3 } [ 5 [ + ] curry map ] compile-call ] unit-test
 
 : funky-assoc>map ( assoc quot -- seq )
     [
         [ call f ] curry assoc-find 3drop
     ] { } make ; inline
 
-[ t ] [| |
+{ t } [| |
     1000 <iota> [ drop 1,000,000 random 1,000,000 random ] H{ } map>assoc :> a-hashtable
     a-hashtable [ [ drop , ] funky-assoc>map ] compile-call
     a-hashtable keys =
 ] unit-test
 
-[ 3 ] [ 1 [ 2 ] [ curry [ 3 ] [ 4 ] if ] compile-call ] unit-test
+{ 3 } [ 1 [ 2 ] [ curry [ 3 ] [ 4 ] if ] compile-call ] unit-test
 
-[ 3 ] [ t [ 3 [ ] curry 4 [ ] curry if ] compile-call ] unit-test
+{ 3 } [ t [ 3 [ ] curry 4 [ ] curry if ] compile-call ] unit-test
 
-[ 3 ] [ t [ 3 [ ] curry [ 4 ] if ] compile-call ] unit-test
+{ 3 } [ t [ 3 [ ] curry [ 4 ] if ] compile-call ] unit-test
 
-[ 4 ] [ f [ 3 [ ] curry 4 [ ] curry if ] compile-call ] unit-test
+{ 4 } [ f [ 3 [ ] curry 4 [ ] curry if ] compile-call ] unit-test
 
-[ 4 ] [ f [ [ 3 ] 4 [ ] curry if ] compile-call ] unit-test
+{ 4 } [ f [ [ 3 ] 4 [ ] curry if ] compile-call ] unit-test

diff --git a/basis/compiler/tests/dead-code.factor b/basis/compiler/tests/dead-code.factor
index 293d76d2c41352354fc5d95b6f012b56dee5f117..219f93a3df2cfd57d2ad392101e5eabf18498fc3 100644 (file)
--- a/basis/compiler/tests/dead-code.factor
+++ b/basis/compiler/tests/dead-code.factor
@@ -6,6 +6,6 @@ IN: compiler.tests.dead-code
 : test-outputs1 ( a b -- ) /i drop ;
 : test-outputs2 ( a b -- ) mod drop ;
 
-[ ] [ 10 3 test-outputs0 ] unit-test
-[ ] [ 10 3 test-outputs1 ] unit-test
-[ ] [ 10 3 test-outputs2 ] unit-test
+{ } [ 10 3 test-outputs0 ] unit-test
+{ } [ 10 3 test-outputs1 ] unit-test
+{ } [ 10 3 test-outputs2 ] unit-test

diff --git a/basis/compiler/tests/folding.factor b/basis/compiler/tests/folding.factor
index 1cf62fce811cccc5ed828830448a6d98af6189b2..98a37338cebee8e80643d79e96fe0ba2acac27c1 100644 (file)
--- a/basis/compiler/tests/folding.factor
+++ b/basis/compiler/tests/folding.factor
@@ -4,9 +4,9 @@ IN: compiler.tests.folding
 
 ! Calls to generic words were not folded away.
 
-[ ] [ [ "compiler.tests.redefine11" forget-vocab ] with-compilation-unit ] unit-test
+{ } [ [ "compiler.tests.redefine11" forget-vocab ] with-compilation-unit ] unit-test
 
-[ ] [
+{ } [
     "USING: math arrays ;
     IN: compiler.tests.folding
     GENERIC: foldable-generic ( a -- b ) foldable
@@ -14,14 +14,14 @@ IN: compiler.tests.folding
     eval( -- )
 ] unit-test
 
-[ ] [
+{ } [
     "USING: math arrays ;
     IN: compiler.tests.folding
     : fold-test ( -- x ) 10 foldable-generic ;"
     eval( -- )
 ] unit-test
 
-[ t ] [
+{ t } [
     "fold-test" "compiler.tests.folding" lookup-word execute
     "fold-test" "compiler.tests.folding" lookup-word execute
     eq?

diff --git a/basis/compiler/tests/redefine0.factor b/basis/compiler/tests/redefine0.factor
index ff928fee286c7e6ef6f2da8e69468405d44f36a2..3e541f61650c7f4fab866c755d9147175e9fa4ec 100644 (file)
--- a/basis/compiler/tests/redefine0.factor
+++ b/basis/compiler/tests/redefine0.factor
@@ -8,13 +8,13 @@ IN: compiler.tests.redefine0
 
 [ test-2 ] [ not-compiled? ] must-fail-with
 
-[ ] [ "IN: compiler.tests.redefine0 : test-1 ( -- ) ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine0 : test-1 ( -- ) ;" eval( -- ) ] unit-test
 
 { 0 0 } [ test-1 ] must-infer-as
 
-[ ] [ test-2 ] unit-test
+{ } [ test-2 ] unit-test
 
-[ ] [
+{ } [
     [
         \ test-1 forget
         \ test-2 forget
@@ -24,13 +24,13 @@ IN: compiler.tests.redefine0
 : test-3 ( a -- ) drop ;
 : test-4 ( -- ) [ 1 2 3 ] test-3 ;
 
-[ ] [ test-4 ] unit-test
+{ } [ test-4 ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine0 USE: kernel : test-3 ( a -- ) call ; inline" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine0 USE: kernel : test-3 ( a -- ) call ; inline" eval( -- ) ] unit-test
 
 [ test-4 ] [ not-compiled? ] must-fail-with
 
-[ ] [
+{ } [
     [
         \ test-3 forget
         \ test-4 forget
@@ -40,13 +40,13 @@ IN: compiler.tests.redefine0
 : test-5 ( a -- quot ) ;
 : test-6 ( a -- b ) test-5 ;
 
-[ 31337 ] [ 31337 test-6 ] unit-test
+{ 31337 } [ 31337 test-6 ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine0 USING: macros kernel ; MACRO: test-5 ( a -- quot ) drop [ ] ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine0 USING: macros kernel ; MACRO: test-5 ( a -- quot ) drop [ ] ;" eval( -- ) ] unit-test
 
 [ 31337 test-6 ] [ not-compiled? ] must-fail-with
 
-[ ] [
+{ } [
     [
         \ test-5 forget
         \ test-6 forget
@@ -62,12 +62,12 @@ M: integer test-7 + ;
 [ 1 test-7 ] [ not-compiled? ] must-fail-with
 [ 1 test-8 ] [ not-compiled? ] must-fail-with
 
-[ ] [ "IN: compiler.tests.redefine0 USING: macros math kernel ; GENERIC: test-7 ( x y -- z ) : test-8 ( a b -- c ) 255 bitand test-7 ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine0 USING: macros math kernel ; GENERIC: test-7 ( x y -- z ) : test-8 ( a b -- c ) 255 bitand test-7 ;" eval( -- ) ] unit-test
 
-[ 4 ] [ 1 3 test-7 ] unit-test
-[ 4 ] [ 1 259 test-8 ] unit-test
+{ 4 } [ 1 3 test-7 ] unit-test
+{ 4 } [ 1 259 test-8 ] unit-test
 
-[ ] [
+{ } [
     [
         \ test-7 forget
         \ test-8 forget
@@ -81,23 +81,23 @@ M: integer test-7 + ;
 MACRO: test-10 ( -- quot ) quot get ; >>
 : test-11 ( -- ) test-10 ;
 
-[ ] [ test-11 ] unit-test
+{ } [ test-11 ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine0 : test-9 ( -- ) 1 ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine0 : test-9 ( -- ) 1 ;" eval( -- ) ] unit-test
 
 ! test-11 should get recompiled now
 
 [ test-11 ] [ not-compiled? ] must-fail-with
 
-[ ] [ "IN: compiler.tests.redefine0 : test-9 ( -- a ) 1 ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine0 : test-9 ( -- a ) 1 ;" eval( -- ) ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine0 : test-9 ( -- ) ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine0 : test-9 ( -- ) ;" eval( -- ) ] unit-test
 
-[ ] [ test-11 ] unit-test
+{ } [ test-11 ] unit-test
 
 quot global delete-at
 
-[ ] [
+{ } [
     [
         \ test-9 forget
         \ test-10 forget

diff --git a/basis/compiler/tests/redefine1.factor b/basis/compiler/tests/redefine1.factor
index c291194019e74cd3b5a244ba80486a157c9c3152..3073c07e9bd70f787e29768d130aa540406c1ef5 100644 (file)
--- a/basis/compiler/tests/redefine1.factor
+++ b/basis/compiler/tests/redefine1.factor
@@ -9,15 +9,15 @@ M: integer method-redefine-generic-1 3 + ;
 
 : method-redefine-test-1 ( -- b ) 3 method-redefine-generic-1 ;
 
-[ 6 ] [ method-redefine-test-1 ] unit-test
+{ 6 } [ method-redefine-test-1 ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine1 USE: math M: fixnum method-redefine-generic-1 4 + ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine1 USE: math M: fixnum method-redefine-generic-1 4 + ;" eval( -- ) ] unit-test
 
-[ 7 ] [ method-redefine-test-1 ] unit-test
+{ 7 } [ method-redefine-test-1 ] unit-test
 
-[ ] [ [ fixnum \ method-redefine-generic-1 lookup-method forget ] with-compilation-unit ] unit-test
+{ } [ [ fixnum \ method-redefine-generic-1 lookup-method forget ] with-compilation-unit ] unit-test
 
-[ 6 ] [ method-redefine-test-1 ] unit-test
+{ 6 } [ method-redefine-test-1 ] unit-test
 
 GENERIC: method-redefine-generic-2 ( a -- b )
 
@@ -25,13 +25,13 @@ M: integer method-redefine-generic-2 3 + ;
 
 : method-redefine-test-2 ( -- b ) 3 method-redefine-generic-2 ;
 
-[ 6 ] [ method-redefine-test-2 ] unit-test
+{ 6 } [ method-redefine-test-2 ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine1 USE: kernel USE: math M: fixnum method-redefine-generic-2 4 + ; USE: strings M: string method-redefine-generic-2 drop f ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine1 USE: kernel USE: math M: fixnum method-redefine-generic-2 4 + ; USE: strings M: string method-redefine-generic-2 drop f ;" eval( -- ) ] unit-test
 
-[ 7 ] [ method-redefine-test-2 ] unit-test
+{ 7 } [ method-redefine-test-2 ] unit-test
 
-[ ] [
+{ } [
     [
         fixnum string [ \ method-redefine-generic-2 lookup-method forget ] bi@
     ] with-compilation-unit

diff --git a/basis/compiler/tests/redefine10.factor b/basis/compiler/tests/redefine10.factor
index c9e1dc9af82269357872b04eca786983e2a0fcd8..9d3ca3feca6e0592edf83294f4cc43f8f3d03e5a 100644 (file)
--- a/basis/compiler/tests/redefine10.factor
+++ b/basis/compiler/tests/redefine10.factor
@@ -22,62 +22,62 @@ M: object fake-float? drop f ;
 
 : my-baked-inline-3 ( a -- b ) { my-mixin } declare fake-float? ;
 
-[ f ] [ 5 my-inline-3 ] unit-test
+{ f } [ 5 my-inline-3 ] unit-test
 
-[ f ] [ 5 my-fake-inline-3 ] unit-test
+{ f } [ 5 my-fake-inline-3 ] unit-test
 
-[ f ] [ 5 my-baked-inline-3 ] unit-test
+{ f } [ 5 my-baked-inline-3 ] unit-test
 
-[ f ] [ 5 my-inline-4 ] unit-test
+{ f } [ 5 my-inline-4 ] unit-test
 
-[ t ] [ 5 my-inline-5 ] unit-test
+{ t } [ 5 my-inline-5 ] unit-test
 
-[ t ] [ 5 my-inline-6 ] unit-test
+{ t } [ 5 my-inline-6 ] unit-test
 
-[ ] [ [ float my-mixin add-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ float my-mixin add-mixin-instance ] with-compilation-unit ] unit-test
 
-[ 2.0 ] [ 1.0 my-inline-1 ] unit-test
+{ 2.0 } [ 1.0 my-inline-1 ] unit-test
 
-[ 2.0 ] [ 1.0 my-inline-2 ] unit-test
+{ 2.0 } [ 1.0 my-inline-2 ] unit-test
 
-[ t ] [ 1.0 my-inline-3 ] unit-test
+{ t } [ 1.0 my-inline-3 ] unit-test
 
-[ t ] [ 1.0 my-fake-inline-3 ] unit-test
+{ t } [ 1.0 my-fake-inline-3 ] unit-test
 
-[ t ] [ 1.0 my-baked-inline-3 ] unit-test
+{ t } [ 1.0 my-baked-inline-3 ] unit-test
 
-[ t ] [ 1.0 my-inline-4 ] unit-test
+{ t } [ 1.0 my-inline-4 ] unit-test
 
-[ f ] [ 1.0 my-inline-5 ] unit-test
+{ f } [ 1.0 my-inline-5 ] unit-test
 
-[ f ] [ 1.0 my-inline-6 ] unit-test
+{ f } [ 1.0 my-inline-6 ] unit-test
 
-[ ] [ [ fixnum my-mixin remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ fixnum my-mixin remove-mixin-instance ] with-compilation-unit ] unit-test
 
-[ f ] [ 5 my-inline-3 ] unit-test
+{ f } [ 5 my-inline-3 ] unit-test
 
-[ f ] [ 5 my-fake-inline-3 ] unit-test
+{ f } [ 5 my-fake-inline-3 ] unit-test
 
-[ f ] [ 5 my-baked-inline-3 ] unit-test
+{ f } [ 5 my-baked-inline-3 ] unit-test
 
-[ f ] [ 5 my-inline-4 ] unit-test
+{ f } [ 5 my-inline-4 ] unit-test
 
-[ f ] [ 5 my-inline-5 ] unit-test
+{ f } [ 5 my-inline-5 ] unit-test
 
-[ f ] [ 5 my-inline-6 ] unit-test
+{ f } [ 5 my-inline-6 ] unit-test
 
-[ ] [ [ float my-mixin remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ float my-mixin remove-mixin-instance ] with-compilation-unit ] unit-test
 
-[ 1.0 ] [ 1.0 my-inline-1 ] unit-test
+{ 1.0 } [ 1.0 my-inline-1 ] unit-test
 
-[ 1.0 ] [ 1.0 my-inline-2 ] unit-test
+{ 1.0 } [ 1.0 my-inline-2 ] unit-test
 
-[ f ] [ 1.0 my-inline-3 ] unit-test
+{ f } [ 1.0 my-inline-3 ] unit-test
 
-[ f ] [ 1.0 my-fake-inline-3 ] unit-test
+{ f } [ 1.0 my-fake-inline-3 ] unit-test
 
-[ f ] [ 1.0 my-inline-4 ] unit-test
+{ f } [ 1.0 my-inline-4 ] unit-test
 
-[ f ] [ 1.0 my-inline-5 ] unit-test
+{ f } [ 1.0 my-inline-5 ] unit-test
 
-[ f ] [ 1.0 my-inline-6 ] unit-test
+{ f } [ 1.0 my-inline-6 ] unit-test

diff --git a/basis/compiler/tests/redefine11.factor b/basis/compiler/tests/redefine11.factor
index c70ae5cb0675d0bacd4cd1384979df372490ece7..d7c2c2018f0d8fb34ccdbc384636fe15831361de 100644 (file)
--- a/basis/compiler/tests/redefine11.factor
+++ b/basis/compiler/tests/redefine11.factor
@@ -4,9 +4,9 @@ IN: compiler.tests.redefine11
 
 ! Mixin redefinition did not recompile all necessary words.
 
-[ ] [ [ "compiler.tests.redefine11" forget-vocab ] with-compilation-unit ] unit-test
+{ } [ [ "compiler.tests.redefine11" forget-vocab ] with-compilation-unit ] unit-test
 
-[ ] [
+{ } [
     "USING: kernel math classes arrays ;
     IN: compiler.tests.redefine11
     MIXIN: my-mixin
@@ -19,13 +19,13 @@ IN: compiler.tests.redefine11
     eval( -- )
 ] unit-test
 
-[ ] [
+{ } [
     [
         array "my-mixin" "compiler.tests.redefine11" lookup-word
         remove-mixin-instance
     ] with-compilation-unit
 ] unit-test
 
-[ 1 ] [
+{ 1 } [
     "my-inline" "compiler.tests.redefine11" lookup-word execute
 ] unit-test

diff --git a/basis/compiler/tests/redefine12.factor b/basis/compiler/tests/redefine12.factor
index ccf6c88e70f8d90a3cbd8a94bea1332f55028b98..8459f248f0e24acd9d2f712fb9157e89b87afa8d 100644 (file)
--- a/basis/compiler/tests/redefine12.factor
+++ b/basis/compiler/tests/redefine12.factor
@@ -10,11 +10,11 @@ M: object g drop t ;
 
 : h ( a -- b ) dup [ g ] when ;
 
-[ f ] [ f h ] unit-test
-[ t ] [ "hi" h ] unit-test
+{ f } [ f h ] unit-test
+{ t } [ "hi" h ] unit-test
 
 TUPLE: jeah ;
 
-[ ] [ "USE: kernel IN: compiler.tests.redefine12 M: jeah g drop f ;" eval( -- ) ] unit-test
+{ } [ "USE: kernel IN: compiler.tests.redefine12 M: jeah g drop f ;" eval( -- ) ] unit-test
 
-[ f ] [ T{ jeah } h ] unit-test
+{ f } [ T{ jeah } h ] unit-test

diff --git a/basis/compiler/tests/redefine14.factor b/basis/compiler/tests/redefine14.factor
index a72db4833ca7db960ecbabae9af4b33a7e860ba0..f061cdfdb89de330953c6baa7ac910ff319e34d7 100644 (file)
--- a/basis/compiler/tests/redefine14.factor
+++ b/basis/compiler/tests/redefine14.factor
@@ -5,4 +5,4 @@ TUPLE: bad ;
 
 M: bad length 1 2 3 ;
 
-[ ] [ [ M\ bad length forget ] with-compilation-unit ] unit-test
+{ } [ [ M\ bad length forget ] with-compilation-unit ] unit-test

diff --git a/basis/compiler/tests/redefine16.factor b/basis/compiler/tests/redefine16.factor
index effe18433eb50dc7c4ebfeecda2f26b1a6befc3a..4fe9350ec80e1f1c833872e11dafa8daac401ccb 100644 (file)
--- a/basis/compiler/tests/redefine16.factor
+++ b/basis/compiler/tests/redefine16.factor
@@ -2,10 +2,10 @@ USING: eval tools.test definitions words compiler.units
 quotations stack-checker ;
 IN: compiler.tests.redefine16
 
-[ ] [ [ "blah" "compiler.tests.redefine16" lookup-word forget ] with-compilation-unit ] unit-test
+{ } [ [ "blah" "compiler.tests.redefine16" lookup-word forget ] with-compilation-unit ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine16 GENERIC#: blah 2 ( foo bar baz -- )" eval( -- ) ] unit-test
-[ ] [ "IN: compiler.tests.redefine16 USING: strings math arrays prettyprint ; M: string blah 1 + 3array . ;" eval( -- ) ] unit-test
-[ ] [ "IN: compiler.tests.redefine16 GENERIC#: blah 2 ( foo bar baz -- x )" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine16 GENERIC#: blah 2 ( foo bar baz -- )" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine16 USING: strings math arrays prettyprint ; M: string blah 1 + 3array . ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine16 GENERIC#: blah 2 ( foo bar baz -- x )" eval( -- ) ] unit-test
 
-[ ] [ [ "blah" "compiler.tests.redefine16" lookup-word forget ] with-compilation-unit ] unit-test
+{ } [ [ "blah" "compiler.tests.redefine16" lookup-word forget ] with-compilation-unit ] unit-test

diff --git a/basis/compiler/tests/redefine17.factor b/basis/compiler/tests/redefine17.factor
index 254f54a50aea62a32e9cff7d8dc507fe5dc8fbdc..91e6b1a5e3660605c0d80cab4c2eac4e5eb48827 100644 (file)
--- a/basis/compiler/tests/redefine17.factor
+++ b/basis/compiler/tests/redefine17.factor
@@ -16,13 +16,13 @@ INSTANCE: array mixin
 
 : blah ( a -- b ) { mixin } declare bong ;
 
-[ { } ] [ { } blah ] unit-test
+{ { } } [ { } blah ] unit-test
 
-[ ] [ [ \ array \ mixin remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ \ array \ mixin remove-mixin-instance ] with-compilation-unit ] unit-test
 
-[ ] [ [ \ string \ mixin add-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ \ string \ mixin add-mixin-instance ] with-compilation-unit ] unit-test
 
-[ 0 ] [ "" blah ] unit-test
+{ 0 } [ "" blah ] unit-test
 
 MIXIN: mixin1
 
@@ -40,10 +40,10 @@ INSTANCE: string mixin2
 
 : bully ( a -- b ) { mixin1 } declare billy ;
 
-[ "" ] [ "" bully ] unit-test
+{ "" } [ "" bully ] unit-test
 
-[ ] [ [ \ string \ mixin1 remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ \ string \ mixin1 remove-mixin-instance ] with-compilation-unit ] unit-test
 
-[ ] [ [ \ array \ mixin1 add-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ \ array \ mixin1 add-mixin-instance ] with-compilation-unit ] unit-test
 
-[ "BILLY" ] [ { } bully ] unit-test
+{ "BILLY" } [ { } bully ] unit-test

diff --git a/basis/compiler/tests/redefine18.factor b/basis/compiler/tests/redefine18.factor
index 7259fb1af976be92ca72941574d8695d1811d003..a42c38b46759153e1287a6e7727962367aaadec4 100644 (file)
--- a/basis/compiler/tests/redefine18.factor
+++ b/basis/compiler/tests/redefine18.factor
@@ -18,8 +18,8 @@ INSTANCE: d c
 
 M: d g2 drop d ;
 
-[ ] [ "IN: compiler.tests.redefine18 SINGLETON: b INSTANCE: b d" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine18 SINGLETON: b INSTANCE: b d" eval( -- ) ] unit-test
 
-[ d ] [ "b" "compiler.tests.redefine18" lookup-word g1 ] unit-test
+{ d } [ "b" "compiler.tests.redefine18" lookup-word g1 ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine18 FORGET: b" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine18 FORGET: b" eval( -- ) ] unit-test

diff --git a/basis/compiler/tests/redefine19.factor b/basis/compiler/tests/redefine19.factor
index c9f741b5c5ca00abae9347601d3ca61a8a761dc4..af70e3cf00fe762d941bec57929d90fcec84ac1a 100644 (file)
--- a/basis/compiler/tests/redefine19.factor
+++ b/basis/compiler/tests/redefine19.factor
@@ -12,12 +12,12 @@ INSTANCE: c m2
 
 : foo ( -- b ) c new g ;
 
-[ 2 ] [ foo ] unit-test
+{ 2 } [ foo ] unit-test
 
-[ ] [ [ c m1 add-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ c m1 add-mixin-instance ] with-compilation-unit ] unit-test
 
-[ { m2 m1 } ] [ \ g order ] unit-test
+{ { m2 m1 } } [ \ g order ] unit-test
 
-[ 1 ] [ foo ] unit-test
+{ 1 } [ foo ] unit-test
 
-[ ] [ [ c m1 remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ c m1 remove-mixin-instance ] with-compilation-unit ] unit-test

diff --git a/basis/compiler/tests/redefine2.factor b/basis/compiler/tests/redefine2.factor
index b6a46fc0df520487bc11dc67848303eb95e1a5f5..1a048a4fe06694e0ec26c9d1fd783ab13b4329c3 100644 (file)
--- a/basis/compiler/tests/redefine2.factor
+++ b/basis/compiler/tests/redefine2.factor
@@ -5,16 +5,16 @@ IN: compiler.tests.redefine2
 
 DEFER: redefine2-test
 
-[ ] [ "USE: sequences USE: kernel IN: compiler.tests.redefine2 TUPLE: redefine2-test ; M: redefine2-test nth 2drop 3 ; INSTANCE: redefine2-test sequence" eval( -- ) ] unit-test
+{ } [ "USE: sequences USE: kernel IN: compiler.tests.redefine2 TUPLE: redefine2-test ; M: redefine2-test nth 2drop 3 ; INSTANCE: redefine2-test sequence" eval( -- ) ] unit-test
 
-[ t ] [ \ redefine2-test symbol? ] unit-test
+{ t } [ \ redefine2-test symbol? ] unit-test
 
-[ t ] [ redefine2-test new sequence? ] unit-test
+{ t } [ redefine2-test new sequence? ] unit-test
 
-[ 3 ] [ 0 redefine2-test new nth-unsafe ] unit-test
+{ 3 } [ 0 redefine2-test new nth-unsafe ] unit-test
 
-[ ] [ [ redefine2-test sequence remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ redefine2-test sequence remove-mixin-instance ] with-compilation-unit ] unit-test
 
-[ f ] [ redefine2-test new sequence? ] unit-test
+{ f } [ redefine2-test new sequence? ] unit-test
 
 [ 0 redefine2-test new nth-unsafe ] must-fail

diff --git a/basis/compiler/tests/redefine20.factor b/basis/compiler/tests/redefine20.factor
index 43045e26e9c20c6944ad634592ee008c94096d65..d313c10e09978ee3bf29444a2d81e4fd6767bbd7 100644 (file)
--- a/basis/compiler/tests/redefine20.factor
+++ b/basis/compiler/tests/redefine20.factor
@@ -12,12 +12,12 @@ TUPLE: funny ;
 
 M: funny cnm-recompile-test call-next-method ;
 
-[ object ] [ funny new cnm-recompile-test ] unit-test
+{ object } [ funny new cnm-recompile-test ] unit-test
 
-[ ] [ [ funny sequence add-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ funny sequence add-mixin-instance ] with-compilation-unit ] unit-test
 
-[ sequence ] [ funny new cnm-recompile-test ] unit-test
+{ sequence } [ funny new cnm-recompile-test ] unit-test
 
-[ ] [ [ funny sequence remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ funny sequence remove-mixin-instance ] with-compilation-unit ] unit-test
 
-[ object ] [ funny new cnm-recompile-test ] unit-test
+{ object } [ funny new cnm-recompile-test ] unit-test

diff --git a/basis/compiler/tests/redefine21.factor b/basis/compiler/tests/redefine21.factor
index 30c00bf7324e89d81126886685ce7b281ae76224..f4f30efd7cc97c1a1e677b86ef6b76a9d93fca79 100644 (file)
--- a/basis/compiler/tests/redefine21.factor
+++ b/basis/compiler/tests/redefine21.factor
@@ -1,10 +1,10 @@
 USING: kernel tools.test definitions compiler.units ;
 IN: compiler.tests.redefine21
 
-[ ] [ : a ( -- ) ; << : b ( quot -- ) call a ; inline >> [ ] b ] unit-test
+{ } [ : a ( -- ) ; << : b ( quot -- ) call a ; inline >> [ ] b ] unit-test
 
-[ ] [ [ { a b } forget-all ] with-compilation-unit ] unit-test
+{ } [ [ { a b } forget-all ] with-compilation-unit ] unit-test
 
-[ ] [ : A ( -- ) ; << : B ( -- ) A ; inline >> B ] unit-test
+{ } [ : A ( -- ) ; << : B ( -- ) A ; inline >> B ] unit-test
 
-[ ] [ [ { A B } forget-all ] with-compilation-unit ] unit-test
+{ } [ [ { A B } forget-all ] with-compilation-unit ] unit-test

diff --git a/basis/compiler/tests/redefine22.factor b/basis/compiler/tests/redefine22.factor
index 5837d68c733d429ae73140d04b62738c76ea0793..389836bfa82d937a52e75f67a4338d6c41fe1afa 100644 (file)
--- a/basis/compiler/tests/redefine22.factor
+++ b/basis/compiler/tests/redefine22.factor
@@ -8,4 +8,4 @@ M: ttt new-sequence 2drop ttt new ;
 : www-1 ( a -- b ) T{ ttt } new-sequence ;
 
 ! This used to break with a compiler error in the above word
-[ ] [ [ \ ttt forget ] with-compilation-unit ] unit-test
+{ } [ [ \ ttt forget ] with-compilation-unit ] unit-test

diff --git a/basis/compiler/tests/redefine3.factor b/basis/compiler/tests/redefine3.factor
index b58bd8447b8ffcf12f08d54fbc073bd292b602b4..b58d607b3f039fdc72b68ba80d1c6fe9135333bb 100644 (file)
--- a/basis/compiler/tests/redefine3.factor
+++ b/basis/compiler/tests/redefine3.factor
@@ -15,20 +15,20 @@ M: empty-mixin sheeple drop "wake up" ; inline
 : compiled-use? ( key word -- ? )
     load-dependencies member-eq? ;
 
-[ "sheeple" ] [ sheeple-test ] unit-test
-[ t ] [ \ sheeple-test word-optimized? ] unit-test
-[ t ] [ object \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
-[ f ] [ empty-mixin \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
+{ "sheeple" } [ sheeple-test ] unit-test
+{ t } [ \ sheeple-test word-optimized? ] unit-test
+{ t } [ object \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
+{ f } [ empty-mixin \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine3 USE: arrays INSTANCE: array empty-mixin" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine3 USE: arrays INSTANCE: array empty-mixin" eval( -- ) ] unit-test
 
-[ "wake up" ] [ sheeple-test ] unit-test
-[ f ] [ object \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
-[ t ] [ empty-mixin \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
+{ "wake up" } [ sheeple-test ] unit-test
+{ f } [ object \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
+{ t } [ empty-mixin \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
 
-[ ] [ [ array empty-mixin remove-mixin-instance ] with-compilation-unit ] unit-test
+{ } [ [ array empty-mixin remove-mixin-instance ] with-compilation-unit ] unit-test
 
-[ "sheeple" ] [ sheeple-test ] unit-test
-[ t ] [ \ sheeple-test word-optimized? ] unit-test
-[ t ] [ object \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
-[ f ] [ empty-mixin \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
+{ "sheeple" } [ sheeple-test ] unit-test
+{ t } [ \ sheeple-test word-optimized? ] unit-test
+{ t } [ object \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test
+{ f } [ empty-mixin \ sheeple lookup-method \ sheeple-test compiled-use? ] unit-test

diff --git a/basis/compiler/tests/redefine4.factor b/basis/compiler/tests/redefine4.factor
index cc74e5a783c03ffeaa7470f9f8373b33b0c9fe46..0bddbbcdff0de4a2c9b1c68bf0c82bd649761a1b 100644 (file)
--- a/basis/compiler/tests/redefine4.factor
+++ b/basis/compiler/tests/redefine4.factor
@@ -5,8 +5,8 @@ IN: compiler.tests.redefine4
 
 : declaration-test ( -- ) declaration-test-1 drop ;
 
-[ "" ] [ [ declaration-test ] with-string-writer ] unit-test
+{ "" } [ [ declaration-test ] with-string-writer ] unit-test
 
-[ ] [ "IN: compiler.tests.redefine4 USE: io : declaration-test-1 ( -- a ) \"X\" write f ;" eval( -- ) ] unit-test
+{ } [ "IN: compiler.tests.redefine4 USE: io : declaration-test-1 ( -- a ) \"X\" write f ;" eval( -- ) ] unit-test
 
-[ "X" ] [ [ declaration-test ] with-string-writer ] unit-test
+{ "X" } [ [ declaration-test ] with-string-writer ] unit-test

diff --git a/basis/compiler/tests/redefine6.factor b/basis/compiler/tests/redefine6.factor
index 31ce19ceba96e591f3fc0e0504e4203ff613e2f2..296a3d0cb3a8f3968708f1bb143684cc4389a14f 100644 (file)
--- a/basis/compiler/tests/redefine6.factor
+++ b/basis/compiler/tests/redefine6.factor
@@ -4,9 +4,9 @@ IN: compiler.tests.redefine6
 
 ! Mixin redefinition did not recompile all necessary words.
 
-[ ] [ [ "compiler.tests.redefine6" forget-vocab ] with-compilation-unit ] unit-test
+{ } [ [ "compiler.tests.redefine6" forget-vocab ] with-compilation-unit ] unit-test
 
-[ ] [
+{ } [
     "USING: kernel kernel.private ;
     IN: compiler.tests.redefine6
     GENERIC: my-generic ( a -- b )
@@ -16,7 +16,7 @@ IN: compiler.tests.redefine6
     eval( -- )
 ] unit-test
 
-[ ] [
+{ } [
     "USING: kernel ;
     IN: compiler.tests.redefine6
     TUPLE: my-tuple ;
@@ -25,7 +25,7 @@ IN: compiler.tests.redefine6
     eval( -- )
 ] unit-test
 
-[ 1 ] [
+{ 1 } [
     "my-tuple" "compiler.tests.redefine6" lookup-word boa
     "my-inline" "compiler.tests.redefine6" lookup-word execute
 ] unit-test

diff --git a/basis/compiler/tests/redefine7.factor b/basis/compiler/tests/redefine7.factor
index c74921361c03dc74a32512f089b6a9cf3589e93f..a4d596c863af10535414c5c5eb47176d8727c93e 100644 (file)
--- a/basis/compiler/tests/redefine7.factor
+++ b/basis/compiler/tests/redefine7.factor
@@ -4,9 +4,9 @@ IN: compiler.tests.redefine7
 
 ! Mixin redefinition did not recompile all necessary words.
 
-[ ] [ [ "compiler.tests.redefine7" forget-vocab ] with-compilation-unit ] unit-test
+{ } [ [ "compiler.tests.redefine7" forget-vocab ] with-compilation-unit ] unit-test
 
-[ ] [
+{ } [
     "USING: kernel math ;
     IN: compiler.tests.redefine7
     MIXIN: my-mixin
@@ -15,13 +15,13 @@ IN: compiler.tests.redefine7
     eval( -- )
 ] unit-test
 
-[ ] [
+{ } [
     "USE: math
     IN: compiler.tests.redefine7
     INSTANCE: float my-mixin"
     eval( -- )
 ] unit-test
 
-[ 2.0 ] [
+{ 2.0 } [
     1.0 "my-inline" "compiler.tests.redefine7" lookup-word execute
 ] unit-test

diff --git a/basis/compiler/tests/redefine8.factor b/basis/compiler/tests/redefine8.factor
index 4e9424978a3f07c7faac0833ea056cc4918abd6e..874cb2633ecec08cfe9cdac0d903677b4eae5155 100644 (file)
--- a/basis/compiler/tests/redefine8.factor
+++ b/basis/compiler/tests/redefine8.factor
@@ -4,9 +4,9 @@ IN: compiler.tests.redefine8
 
 ! Mixin redefinition did not recompile all necessary words.
 
-[ ] [ [ "compiler.tests.redefine8" forget-vocab ] with-compilation-unit ] unit-test
+{ } [ [ "compiler.tests.redefine8" forget-vocab ] with-compilation-unit ] unit-test
 
-[ ] [
+{ } [
     "USING: kernel math math.order sorting ;
     IN: compiler.tests.redefine8
     MIXIN: my-mixin
@@ -18,13 +18,13 @@ IN: compiler.tests.redefine8
     eval( -- )
 ] unit-test
 
-[ ] [
+{ } [
     "USE: math
     IN: compiler.tests.redefine8
     INSTANCE: float my-mixin"
     eval( -- )
 ] unit-test
 
-[ 2.0 ] [
+{ 2.0 } [
     1.0 "my-generic" "compiler.tests.redefine8" lookup-word execute
 ] unit-test

diff --git a/basis/compiler/tests/redefine9.factor b/basis/compiler/tests/redefine9.factor
index e76f5edf2e643e36fcb5ca9e3a999636d53c0045..b8320d67490479ebe51830b1a8ce748a002f69b2 100644 (file)
--- a/basis/compiler/tests/redefine9.factor
+++ b/basis/compiler/tests/redefine9.factor
@@ -4,9 +4,9 @@ IN: compiler.tests.redefine9
 
 ! Mixin redefinition did not recompile all necessary words.
 
-[ ] [ [ "compiler.tests.redefine9" forget-vocab ] with-compilation-unit ] unit-test
+{ } [ [ "compiler.tests.redefine9" forget-vocab ] with-compilation-unit ] unit-test
 
-[ ] [
+{ } [
     "USING: kernel math math.order sorting ;
     IN: compiler.tests.redefine9
     MIXIN: my-mixin
@@ -18,7 +18,7 @@ IN: compiler.tests.redefine9
     eval( -- )
 ] unit-test
 
-[ ] [
+{ } [
     "USE: math
     IN: compiler.tests.redefine9
     TUPLE: my-tuple ;

diff --git a/basis/io/files/info/windows/windows-tests.factor b/basis/io/files/info/windows/windows-tests.factor
index b87cb6ba2d3644621d6c8a4b3a86d0581d179839..a5891807a0f58732013d59c9a9fabce289694349 100644 (file)
--- a/basis/io/files/info/windows/windows-tests.factor
+++ b/basis/io/files/info/windows/windows-tests.factor
@@ -2,4 +2,4 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: tools.test io.files.info.windows system kernel ;
 
-[ ] [ vm-path file-times 3drop ] unit-test
+{ } [ vm-path file-times 3drop ] unit-test

diff --git a/basis/io/launcher/windows/windows-tests.factor b/basis/io/launcher/windows/windows-tests.factor
index c0a3795798e2af6c935deed2ac96d1b23207a63f..460c38666a00a96c6bd10e6a26b6e394d70b2e1e 100644 (file)
--- a/basis/io/launcher/windows/windows-tests.factor
+++ b/basis/io/launcher/windows/windows-tests.factor
@@ -7,59 +7,59 @@ io.pathnames kernel math namespaces parser sequences
 splitting system tools.test ;
 IN: io.launcher.windows.tests
 
-[ "hello world" ] [ { "hello" "world" } join-arguments ] unit-test
+{ "hello world" } [ { "hello" "world" } join-arguments ] unit-test
 
-[ "bob \"mac arthur\"" ] [ { "bob" "mac arthur" } join-arguments ] unit-test
+{ "bob \"mac arthur\"" } [ { "bob" "mac arthur" } join-arguments ] unit-test
 
-[ "bob mac\\\\arthur" ] [ { "bob" "mac\\\\arthur" } join-arguments ] unit-test
+{ "bob mac\\\\arthur" } [ { "bob" "mac\\\\arthur" } join-arguments ] unit-test
 
-[ "bob \"mac arthur\\\\\"" ] [ { "bob" "mac arthur\\" } join-arguments ] unit-test
+{ "bob \"mac arthur\\\\\"" } [ { "bob" "mac arthur\\" } join-arguments ] unit-test
 
 ! Bug #245
-[ "\\\"hi\\\"" ] [ { "\"hi\"" } join-arguments ] unit-test
+{ "\\\"hi\\\"" } [ { "\"hi\"" } join-arguments ] unit-test
 
-[ "\"\\\"hi you\\\"\"" ] [ { "\"hi you\"" } join-arguments ] unit-test
+{ "\"\\\"hi you\\\"\"" } [ { "\"hi you\"" } join-arguments ] unit-test
 
 ! Commented line -- what should appear on the command line
 ! \foo\\bar\\\bas\ -> \foo\\bar\\\bas\
-[ "\\foo\\\\bar\\\\\\bas\\" ]
+{ "\\foo\\\\bar\\\\\\bas\\" }
 [ { "\\foo\\\\bar\\\\\\bas\\" } join-arguments ] unit-test
 
 ! \"foo"\\bar\\\bas\ -> \\\"foo\"\\bar\\\bas\
-[ "\\\\\\\"foo\\\"\\\\bar\\\\\\bas\\" ]
+{ "\\\\\\\"foo\\\"\\\\bar\\\\\\bas\\" }
 [ { "\\\"foo\"\\\\bar\\\\\\bas\\" } join-arguments ] unit-test
 
 ! \foo\\"bar"\\\bas\ -> \foo\\\\\"bar\"\\\bas\
-[ "\\foo\\\\\\\\\\\"bar\\\"\\\\\\bas\\" ]
+{ "\\foo\\\\\\\\\\\"bar\\\"\\\\\\bas\\" }
 [ { "\\foo\\\\\"bar\"\\\\\\bas\\" } join-arguments ] unit-test
 
 ! \foo\\bar\\\"bas"\ -> \foo\\bar\\\\\\\"bas\"\
-[ "\\foo\\\\bar\\\\\\\\\\\\\\\"bas\\\"\\" ]
+{ "\\foo\\\\bar\\\\\\\\\\\\\\\"bas\\\"\\" }
 [ { "\\foo\\\\bar\\\\\\\"bas\"\\" } join-arguments ] unit-test
 
 ! \foo\\bar bar\\\bas\ -> "\foo\\bar bar\\\bas\\"
-[ "\"\\foo\\\\bar bar\\\\\\bas\\\\\"" ]
+{ "\"\\foo\\\\bar bar\\\\\\bas\\\\\"" }
 [ { "\\foo\\\\bar bar\\\\\\bas\\" } join-arguments ] unit-test
 
 
-[ ] [
+{ } [
     <process>
         "notepad" >>command
         1/2 seconds >>timeout
     "notepad" set
 ] unit-test
 
-[ f ] [ "notepad" get process-running? ] unit-test
+{ f } [ "notepad" get process-running? ] unit-test
 
-[ f ] [ "notepad" get process-started? ] unit-test
+{ f } [ "notepad" get process-started? ] unit-test
 
-[ ] [ "notepad" [ run-detached ] change ] unit-test
+{ } [ "notepad" [ run-detached ] change ] unit-test
 
 [ "notepad" get wait-for-process ] must-fail
 
-[ t ] [ "notepad" get killed>> ] unit-test
+{ t } [ "notepad" get killed>> ] unit-test
 
-[ f ] [ "notepad" get process-running? ] unit-test
+{ f } [ "notepad" get process-running? ] unit-test
 
 [
     <process>
@@ -80,7 +80,7 @@ IN: io.launcher.windows.tests
 
 SYMBOLS: out-path err-path ;
 
-[ ] [
+{ } [
     <process>
         console-vm-path "-run=hello-world" 2array >>command
         [ "out" ".txt" unique-file ] with-temp-directory
@@ -88,11 +88,11 @@ SYMBOLS: out-path err-path ;
     try-process
 ] unit-test
 
-[ "Hello world" ] [
+{ "Hello world" } [
     out-path get-global ascii file-lines first
 ] unit-test
 
-[ "IN: scratchpad " ] [
+{ "IN: scratchpad " } [
     <process>
         console-vm-path "-run=listener" 2array >>command
         +closed+ >>stdin
@@ -103,7 +103,7 @@ SYMBOLS: out-path err-path ;
 : launcher-test-path ( -- str )
     "resource:basis/io/launcher/windows/test" ;
 
-[ ] [
+{ } [
     launcher-test-path [
         <process>
             console-vm-path "-script" "stderr.factor" 3array >>command
@@ -115,15 +115,15 @@ SYMBOLS: out-path err-path ;
     ] with-directory
 ] unit-test
 
-[ "output" ] [
+{ "output" } [
     out-path get-global ascii file-lines first
 ] unit-test
 
-[ "error" ] [
+{ "error" } [
     err-path get-global ascii file-lines first
 ] unit-test
 
-[ ] [
+{ } [
     launcher-test-path [
         <process>
             console-vm-path "-script" "stderr.factor" 3array >>command
@@ -134,11 +134,11 @@ SYMBOLS: out-path err-path ;
     ] with-directory
 ] unit-test
 
-[ "outputerror" ] [
+{ "outputerror" } [
     out-path get-global ascii file-lines first
 ] unit-test
 
-[ "output" ] [
+{ "output" } [
     launcher-test-path [
         <process>
             console-vm-path "-script" "stderr.factor" 3array >>command
@@ -148,13 +148,11 @@ SYMBOLS: out-path err-path ;
     ] with-directory
 ] unit-test
 
-[ "error" ] [
+{ "error" } [
     err-path get-global ascii file-lines first
 ] unit-test
 
-
-
-[ t ] [
+{ t } [
     launcher-test-path [
         <process>
             console-vm-path "-script" "env.factor" 3array >>command
@@ -164,7 +162,7 @@ SYMBOLS: out-path err-path ;
     os-envs =
 ] unit-test
 
-[ t ] [
+{ t } [
     launcher-test-path [
         <process>
             console-vm-path "-script" "env.factor" 3array >>command
@@ -176,7 +174,7 @@ SYMBOLS: out-path err-path ;
     os-envs =
 ] unit-test
 
-[ "B" ] [
+{ "B" } [
     launcher-test-path [
         <process>
             console-vm-path "-script" "env.factor" 3array >>command
@@ -187,7 +185,7 @@ SYMBOLS: out-path err-path ;
     "A" of
 ] unit-test
 
-[ f ] [
+{ f } [
     launcher-test-path [
         <process>
             console-vm-path "-script" "env.factor" 3array >>command
@@ -200,7 +198,7 @@ SYMBOLS: out-path err-path ;
 ] unit-test
 
 2 [
-    [ ] [
+    { } [
         <process>
             "cmd.exe /c dir" >>command
             [ "dir" ".txt" unique-file ] with-temp-directory
@@ -208,7 +206,7 @@ SYMBOLS: out-path err-path ;
         try-process
     ] unit-test
 
-    [ ] [ out-path get-global delete-file ] unit-test
+    { } [ out-path get-global delete-file ] unit-test
 ] times
 
 { "Hello appender\r\nÖrjan ågren är åter\r\nHello appender\r\nÖrjan ågren är åter\r\n" } [
@@ -229,17 +227,17 @@ SYMBOLS: out-path err-path ;
     "cmd /c echo.This is a hidden process." utf8 (process-stream) hidden>> swap stream-contents
 ] unit-test
 
-[ "IN: scratchpad " ] [
+{ "IN: scratchpad " } [
     console-vm-path "-run=listener" 2array
     ascii [ "USE: system 0 exit" print flush read-lines last ] with-process-stream
 ] unit-test
 
-[ ] [
+{ } [
     console-vm-path "-run=listener" 2array
     ascii [ "USE: system 0 exit" print ] with-process-writer
 ] unit-test
 
-[ ] [
+{ } [
     <process>
     console-vm-path "-run=listener" 2array >>command
     "vocab:io/launcher/windows/test/input.txt" >>stdin

diff --git a/basis/io/sockets/sockets-tests.factor b/basis/io/sockets/sockets-tests.factor
index 2cd28301810f33fc525de95c429701fc0be895c8..56f707de6cd24ccb1f29f79b4f666fc3b5c104a5 100644 (file)
--- a/basis/io/sockets/sockets-tests.factor
+++ b/basis/io/sockets/sockets-tests.factor
@@ -178,14 +178,14 @@ os unix? [
 
 [ "you-cant-resolve-me!" resolve-host ] [ addrinfo-error? ] must-fail-with
 
-[ ] [ B{ 1 2 3 } f 9000 <inet4> send-once ] unit-test
-[ ] [ B{ 1 2 3 } f 9000 <inet4> broadcast-once ] unit-test
-[ ] [ B{ 1 2 3 } "0.0.0.0" 9000 <inet4> send-once ] unit-test
-[ ] [ B{ 1 2 3 } "0.0.0.0" 9000 <inet4> broadcast-once ] unit-test
+{ } [ B{ 1 2 3 } f 9000 <inet4> send-once ] unit-test
+{ } [ B{ 1 2 3 } f 9000 <inet4> broadcast-once ] unit-test
+{ } [ B{ 1 2 3 } "0.0.0.0" 9000 <inet4> send-once ] unit-test
+{ } [ B{ 1 2 3 } "0.0.0.0" 9000 <inet4> broadcast-once ] unit-test
 
 ipv6-supported? [
-    [ ] [ B{ 1 2 3 } f 9000 <inet6> send-once ] unit-test
-    [ ] [ B{ 1 2 3 } f 9000 <inet6> broadcast-once ] unit-test
-    [ ] [ B{ 1 2 3 } "::" 9000 <inet6> send-once ] unit-test
-    [ ] [ B{ 1 2 3 } "::" 9000 <inet6> broadcast-once ] unit-test
+    { } [ B{ 1 2 3 } f 9000 <inet6> send-once ] unit-test
+    { } [ B{ 1 2 3 } f 9000 <inet6> broadcast-once ] unit-test
+    { } [ B{ 1 2 3 } "::" 9000 <inet6> send-once ] unit-test
+    { } [ B{ 1 2 3 } "::" 9000 <inet6> broadcast-once ] unit-test
 ] when

diff --git a/basis/windows/directx/dinput/constants/constants-tests.factor b/basis/windows/directx/dinput/constants/constants-tests.factor
index eceafeb2f0ddb0405b8c77825913f5646983fa10..7c6f7fe8cffdd9688a474bdc4159968f805720ec 100644 (file)
--- a/basis/windows/directx/dinput/constants/constants-tests.factor
+++ b/basis/windows/directx/dinput/constants/constants-tests.factor
@@ -1,5 +1,5 @@
 IN: windows.directx.dinput.constants.tests
 USING: tools.test windows.directx.dinput.constants.private ;
 
-[ ] [ define-constants ] unit-test
-[ ] [ free-dinput-constants ] unit-test
+{ } [ define-constants ] unit-test
+{ } [ free-dinput-constants ] unit-test

diff --git a/basis/xml/tests/test.factor b/basis/xml/tests/test.factor
index 1ee7ecc166a3735d546662959d14d9e4113b8b6f..ac56c609c2cc03c2c629fe2f17e3c51c32e3a70c 100644 (file)
--- a/basis/xml/tests/test.factor
+++ b/basis/xml/tests/test.factor
@@ -10,69 +10,69 @@ sequences.deep accessors io.streams.string ;
 [ [ drop ] each-element ] must-infer
 
 SYMBOL: xml-file
-[ ] [
+{ } [
     "vocab:xml/tests/test.xml"
     [ file>xml ] with-html-entities xml-file set
 ] unit-test
-[ t ] [
+{ t } [
     "vocab:xml/tests/test.xml" binary file-contents
     [ bytes>xml ] with-html-entities xml-file get =
 ] unit-test
-[ "1.0" ] [ xml-file get prolog>> version>> ] unit-test
-[ f ] [ xml-file get prolog>> standalone>> ] unit-test
-[ "a" ] [ xml-file get space>> ] unit-test
-[ "http://www.hello.com" ] [ xml-file get url>> ] unit-test
-[ "that" ] [
+{ "1.0" } [ xml-file get prolog>> version>> ] unit-test
+{ f } [ xml-file get prolog>> standalone>> ] unit-test
+{ "a" } [ xml-file get space>> ] unit-test
+{ "http://www.hello.com" } [ xml-file get url>> ] unit-test
+{ "that" } [
     xml-file get T{ name f "" "this" "http://d.de" } attr
 ] unit-test
-[ t ] [ xml-file get children>> second contained-tag? ] unit-test
+{ t } [ xml-file get children>> second contained-tag? ] unit-test
 [ "<a></b>" string>xml ] [ xml-error? ] must-fail-with
-[ T{ comment f "This is where the fun begins!" } ] [
+{ T{ comment f "This is where the fun begins!" } } [
     xml-file get before>> [ comment? ] find nip
 ] unit-test
-[ "xsl stylesheet=\"that-one.xsl\"" ] [
+{ "xsl stylesheet=\"that-one.xsl\"" } [
     xml-file get after>> [ instruction? ] find nip text>>
 ] unit-test
-[ V{ "fa&g" } ] [ xml-file get "x" get-id children>> ] unit-test
-[ "that" ] [ xml-file get "this" attr ] unit-test
-[ "abcd" ] [
+{ V{ "fa&g" } } [ xml-file get "x" get-id children>> ] unit-test
+{ "that" } [ xml-file get "this" attr ] unit-test
+{ "abcd" } [
     "<main>a<sub>bc</sub>d<nothing/></main>" string>xml
     [ [ dup string? [ % ] [ drop ] if ] deep-each ] "" make
 ] unit-test
-[ "abcd" ] [
+{ "abcd" } [
     "<main>a<sub>bc</sub>d<nothing/></main>" string>xml
     [ string? ] deep-filter concat
 ] unit-test
-[ "foo" ] [
+{ "foo" } [
     "<a><b id='c'>foo</b><d id='e'/></a>" string>xml
     "c" get-id children>string
 ] unit-test
-[ "foo" ] [
+{ "foo" } [
     "<x y='foo'/>" string>xml
     dup dup "y" attr "z" set-attr
     T{ name { space "blah" } { main "z" } } attr
 ] unit-test
 [ "<!-- B+, B, or B--->" string>xml ] must-fail
-[ ] [ "<?xml version='1.0'?><!-- declarations for <head> & <body> --><foo/>" string>xml drop ] unit-test
+{ } [ "<?xml version='1.0'?><!-- declarations for <head> & <body> --><foo/>" string>xml drop ] unit-test
 
 : first-thing ( seq -- elt )
     "" swap remove first ;
 
-[ T{ element-decl f "br" "EMPTY" } ] [ "<!ELEMENT br EMPTY>" string>dtd directives>> first-thing ] unit-test
-[ T{ element-decl f "p" "(#PCDATA|emph)*" } ] [ "<!ELEMENT p (#PCDATA|emph)*>" string>dtd directives>> first-thing ] unit-test
-[ T{ element-decl f "%name.para;" "%content.para;" } ] [ "<!ELEMENT %name.para; %content.para;>" string>dtd directives>> first-thing ] unit-test
-[ T{ element-decl f "container" "ANY" } ] [ "<!ELEMENT container ANY>" string>dtd directives>> first-thing ] unit-test
-[ T{ doctype-decl f "foo" } ] [ "<!DOCTYPE foo>" string>xml-chunk first-thing ] unit-test
-[ T{ doctype-decl f "foo" } ] [ "<!DOCTYPE foo >" string>xml-chunk first-thing ] unit-test
-[ T{ doctype-decl f "foo" T{ system-id f "blah.dtd" } } ] [ "<!DOCTYPE foo SYSTEM 'blah.dtd'>" string>xml-chunk first-thing ] unit-test
-[ T{ doctype-decl f "foo" T{ system-id f "blah.dtd" } } ] [ "<!DOCTYPE foo   SYSTEM \"blah.dtd\"   >" string>xml-chunk first-thing ] unit-test
-[ 958 ] [ [ "&xi;" string>xml-chunk ] with-html-entities first first ] unit-test
-[ "x" "<" ] [ "<x value='&lt;'/>" string>xml [ name>> main>> ] [ "value" attr ] bi ] unit-test
-[ "foo" ] [ "<!DOCTYPE foo [<!ENTITY bar 'foo'>]><x>&bar;</x>" string>xml children>string ] unit-test
-[ T{ xml-chunk f V{ "hello" } } ] [ "hello" string>xml-chunk ] unit-test
-[ "1.1" ] [ "<?xml version='1.1'?><x/>" string>xml prolog>> version>> ] unit-test
-[ "ß" ] [ "<x>ß</x>" <string-reader> read-xml children>string ] unit-test
+{ T{ element-decl f "br" "EMPTY" } } [ "<!ELEMENT br EMPTY>" string>dtd directives>> first-thing ] unit-test
+{ T{ element-decl f "p" "(#PCDATA|emph)*" } } [ "<!ELEMENT p (#PCDATA|emph)*>" string>dtd directives>> first-thing ] unit-test
+{ T{ element-decl f "%name.para;" "%content.para;" } } [ "<!ELEMENT %name.para; %content.para;>" string>dtd directives>> first-thing ] unit-test
+{ T{ element-decl f "container" "ANY" } } [ "<!ELEMENT container ANY>" string>dtd directives>> first-thing ] unit-test
+{ T{ doctype-decl f "foo" } } [ "<!DOCTYPE foo>" string>xml-chunk first-thing ] unit-test
+{ T{ doctype-decl f "foo" } } [ "<!DOCTYPE foo >" string>xml-chunk first-thing ] unit-test
+{ T{ doctype-decl f "foo" T{ system-id f "blah.dtd" } } } [ "<!DOCTYPE foo SYSTEM 'blah.dtd'>" string>xml-chunk first-thing ] unit-test
+{ T{ doctype-decl f "foo" T{ system-id f "blah.dtd" } } } [ "<!DOCTYPE foo   SYSTEM \"blah.dtd\"   >" string>xml-chunk first-thing ] unit-test
+{ 958 } [ [ "&xi;" string>xml-chunk ] with-html-entities first first ] unit-test
+{ "x" "<" } [ "<x value='&lt;'/>" string>xml [ name>> main>> ] [ "value" attr ] bi ] unit-test
+{ "foo" } [ "<!DOCTYPE foo [<!ENTITY bar 'foo'>]><x>&bar;</x>" string>xml children>string ] unit-test
+{ T{ xml-chunk f V{ "hello" } } } [ "hello" string>xml-chunk ] unit-test
+{ "1.1" } [ "<?xml version='1.1'?><x/>" string>xml prolog>> version>> ] unit-test
+{ "ß" } [ "<x>ß</x>" <string-reader> read-xml children>string ] unit-test
 
 ! <pull-xml> tests
 ! this tests just checks that pull-event doesn't raise an exception
-[ ] [ "vocab:xml/tests/test.xml" binary [ <pull-xml> pull-event drop ] with-file-reader ] unit-test
+{ } [ "vocab:xml/tests/test.xml" binary [ <pull-xml> pull-event drop ] with-file-reader ] unit-test

diff --git a/basis/xml/tests/xmltest.factor b/basis/xml/tests/xmltest.factor
index dd55a2f3a5c7a61e94cee2a296add09fd4feb604..e22951b0f341705e00d27135c28a93976b09e0d0 100644 (file)
--- a/basis/xml/tests/xmltest.factor
+++ b/basis/xml/tests/xmltest.factor
@@ -46,4 +46,4 @@ CONSTANT: base "vocab:xml/tests/xmltest/"
 : failing-valids ( -- tests )
     partition-xml-tests nip [ second first ] map [ type>> "valid" = ] filter ;
 
-[ ] [ partition-xml-tests 2drop ] unit-test
+{ } [ partition-xml-tests 2drop ] unit-test

diff --git a/extra/multi-methods/tests/syntax.factor b/extra/multi-methods/tests/syntax.factor
index 1de8503b291179038154f30f767d3af88c230c4d..03dd04ef9f1249accee5c01e233335e62dea2b94 100644 (file)
--- a/extra/multi-methods/tests/syntax.factor
+++ b/extra/multi-methods/tests/syntax.factor
@@ -6,7 +6,7 @@ IN: multi-methods.tests
 
 multi-methods:GENERIC: first-test ( -- )
 
-[ t ] [ \ first-test generic? ] unit-test
+{ t } [ \ first-test generic? ] unit-test
 
 MIXIN: thing
 
@@ -24,14 +24,14 @@ METHOD: beats? { thing thing } 2drop f ;
 : play ( obj1 obj2 -- ? ) beats? ;
 
 [ { } 3 play ] must-fail
-[ t ] [ error get no-method? ] unit-test
-[ ] [ error get error. ] unit-test
-[ { { } 3 } ] [ error get arguments>> ] unit-test
-[ t ] [ paper scissors play ] unit-test
-[ f ] [ scissors paper play ] unit-test
+{ t } [ error get no-method? ] unit-test
+{ } [ error get error. ] unit-test
+{ { { } 3 } } [ error get arguments>> ] unit-test
+{ t } [ paper scissors play ] unit-test
+{ f } [ scissors paper play ] unit-test
 
-[ t ] [ { beats? paper scissors } method-spec? ] unit-test
-[ ] [ { beats? paper scissors } see ] unit-test
+{ t } [ { beats? paper scissors } method-spec? ] unit-test
+{ } [ { beats? paper scissors } see ] unit-test
 
 SYMBOL: some-var
 
@@ -42,15 +42,15 @@ METHOD: hook-test { { some-var array } } class-of ;
 METHOD: hook-test { hashtable { some-var number } } assoc-size ;
 
 { 1 2 3 } some-var set
-[ { f t t } ] [ { t t f } hook-test ] unit-test
+{ { f t t } } [ { t t f } hook-test ] unit-test
 [ fixnum ] [ 3 hook-test ] unit-test
 5.0 some-var set
-[ 0 ] [ H{ } hook-test ] unit-test
+{ 0 } [ H{ } hook-test ] unit-test
 
 "error" some-var set
 [ H{ } hook-test ] must-fail
-[ t ] [ error get no-method? ] unit-test
-[ { H{ } "error" } ] [ error get arguments>> ] unit-test
+{ t } [ error get no-method? ] unit-test
+{ { H{ } "error" } } [ error get arguments>> ] unit-test
 
 MIXIN: busted