Revert "factor: rename [ ] [ ] unit-test -> { } [ ] unit-test using a refactoring...

[factor.git] / basis / compiler / tree / dead-code / dead-code-tests.factor

diff --git a/basis/compiler/tree/dead-code/dead-code-tests.factor b/basis/compiler/tree/dead-code/dead-code-tests.factor
index f99335456b81b3513a114804a722f298b0708eb9..1ea78be523006a8947f7be8d2d12d4456b157c2e 100644 (file)
--- a/basis/compiler/tree/dead-code/dead-code-tests.factor
+++ b/basis/compiler/tree/dead-code/dead-code-tests.factor
@@ -26,41 +26,41 @@ IN: compiler.tree.dead-code.tests
         [ out-d>> length + ] [ drop ] if
     ] each-node ;
 
-{ 3 } [ [ 1 2 3 ] count-live-values ] unit-test
+[ 3 ] [ [ 1 2 3 ] count-live-values ] unit-test
 
-{ 1 } [ [ drop ] count-live-values ] unit-test
+[ 1 ] [ [ drop ] count-live-values ] unit-test
 
-{ 0 } [ [ 1 drop ] count-live-values ] unit-test
+[ 0 ] [ [ 1 drop ] count-live-values ] unit-test
 
-{ 1 } [ [ 1 2 drop ] count-live-values ] unit-test
+[ 1 ] [ [ 1 2 drop ] count-live-values ] unit-test
 
-{ 3 } [ [ [ 1 ] [ 2 ] if ] count-live-values ] unit-test
+[ 3 ] [ [ [ 1 ] [ 2 ] if ] count-live-values ] unit-test
 
-{ 1 } [ [ [ 1 ] [ 2 ] if drop ] count-live-values ] unit-test
+[ 1 ] [ [ [ 1 ] [ 2 ] if drop ] count-live-values ] unit-test
 
-{ 2 } [ [ [ 1 ] [ dup ] if drop ] count-live-values ] unit-test
+[ 2 ] [ [ [ 1 ] [ dup ] if drop ] count-live-values ] unit-test
 
-{ 2 } [ [ 1 + ] count-live-values ] unit-test
+[ 2 ] [ [ 1 + ] count-live-values ] unit-test
 
-{ 0 } [ [ 1 2 + drop ] count-live-values ] unit-test
+[ 0 ] [ [ 1 2 + drop ] count-live-values ] unit-test
 
-{ 3 } [ [ 1 + 3 + ] count-live-values ] unit-test
+[ 3 ] [ [ 1 + 3 + ] count-live-values ] unit-test
 
-{ 0 } [ [ 1 2 + 3 + drop ] count-live-values ] unit-test
+[ 0 ] [ [ 1 2 + 3 + drop ] count-live-values ] unit-test
 
-{ 4 } [ [ [ 1 ] [ 2 ] if 3 + ] count-live-values ] unit-test
+[ 4 ] [ [ [ 1 ] [ 2 ] if 3 + ] count-live-values ] unit-test
 
-{ 1 } [ [ [ 1 ] [ 2 ] if 3 + drop ] count-live-values ] unit-test
+[ 1 ] [ [ [ 1 ] [ 2 ] if 3 + drop ] count-live-values ] unit-test
 
-{ 0 } [ [ [ ] call ] count-live-values ] unit-test
+[ 0 ] [ [ [ ] call ] count-live-values ] unit-test
 
-{ 1 } [ [ [ 1 ] call ] count-live-values ] unit-test
+[ 1 ] [ [ [ 1 ] call ] count-live-values ] unit-test
 
-{ 2 } [ [ [ 1 ] [ 2 ] compose call ] count-live-values ] unit-test
+[ 2 ] [ [ [ 1 ] [ 2 ] compose call ] count-live-values ] unit-test
 
-{ 0 } [ [ [ 1 ] [ 2 ] compose call + drop ] count-live-values ] unit-test
+[ 0 ] [ [ [ 1 ] [ 2 ] compose call + drop ] count-live-values ] unit-test
 
-{ 3 } [ [ 10 [ ] times ] count-live-values ] unit-test
+[ 3 ] [ [ 10 [ ] times ] count-live-values ] unit-test
 
 : optimize-quot ( quot -- quot' )
     build-tree
@@ -74,40 +74,40 @@ IN: compiler.tree.dead-code.tests
     remove-dead-code
     "no-check" get [ dup check-nodes ] unless nodes>quot ;
 
-{ [ drop 1 ] } [ [ [ 1 ] dip drop ] optimize-quot ] unit-test
+[ [ drop 1 ] ] [ [ [ 1 ] dip drop ] optimize-quot ] unit-test
 
-{ [ stream-read1 drop 1 2 ] } [ [ stream-read1 [ 1 2 ] dip drop ] optimize-quot ] unit-test
+[ [ stream-read1 drop 1 2 ] ] [ [ stream-read1 [ 1 2 ] dip drop ] optimize-quot ] unit-test
 
-{ [ over >R + R> ] } [ [ [ + ] [ drop ] 2bi ] optimize-quot ] unit-test
+[ [ over >R + R> ] ] [ [ [ + ] [ drop ] 2bi ] optimize-quot ] unit-test
 
-{ [ [ ] [ ] if ] } [ [ [ 1 ] [ 2 ] if drop ] optimize-quot ] unit-test
+[ [ [ ] [ ] if ] ] [ [ [ 1 ] [ 2 ] if drop ] optimize-quot ] unit-test
 
 : flushable-1 ( a b -- c ) 2drop f ; flushable
 : flushable-2 ( a b -- c ) 2drop f ; flushable
 
-{ [ 2nip [ ] [ ] if ] } [
+[ [ 2nip [ ] [ ] if ] ] [
     [ [ flushable-1 ] [ flushable-2 ] if drop ] optimize-quot
 ] unit-test
 
 : non-flushable-3 ( a b -- c ) 2drop f ;
 
-{ [ [ 2drop ] [ non-flushable-3 drop ] if ] } [
+[ [ [ 2drop ] [ non-flushable-3 drop ] if ] ] [
     [ [ flushable-1 ] [ non-flushable-3 ] if drop ] optimize-quot
 ] unit-test
 
-{ [ [ f ] [ f ] if ] } [ [ [ f ] [ f ] if ] optimize-quot ] unit-test
+[ [ [ f ] [ f ] if ] ] [ [ [ f ] [ f ] if ] optimize-quot ] unit-test
 
-{ } [ [ dup [ 3 throw ] [ ] if ] optimize-quot drop ] unit-test
+[ ] [ [ dup [ 3 throw ] [ ] if ] optimize-quot drop ] unit-test
 
-{ [ [ . ] [ drop ] if ] } [ [ [ dup . ] [ ] if drop ] optimize-quot ] unit-test
+[ [ [ . ] [ drop ] if ] ] [ [ [ dup . ] [ ] if drop ] optimize-quot ] unit-test
 
-{ [ f ] } [ [ f dup [ ] [ ] if ] optimize-quot ] unit-test
+[ [ f ] ] [ [ f dup [ ] [ ] if ] optimize-quot ] unit-test
 
-{ } [ [ over [ ] [ dup [ "X" throw ] [ "X" throw ] if ] if ] optimize-quot drop ] unit-test
+[ ] [ [ over [ ] [ dup [ "X" throw ] [ "X" throw ] if ] if ] optimize-quot drop ] unit-test
 
 : boo ( a b -- c ) 2drop f ;
 
-{ [ dup 4 eq? [ nip ] [ boo ] if ] } [ [ dup dup 4 eq? [ drop nip ] [ drop boo ] if ] optimize-quot ] unit-test
+[ [ dup 4 eq? [ nip ] [ boo ] if ] ] [ [ dup dup 4 eq? [ drop nip ] [ drop boo ] if ] optimize-quot ] unit-test
 
 : squish ( quot -- quot' )
     [
@@ -121,7 +121,7 @@ IN: compiler.tree.dead-code.tests
 : call-recursive-dce-1 ( a -- b )
     [ call-recursive-dce-1 drop ] [ call-recursive-dce-1 ] bi ; inline recursive
 
-{ [ drop "WRAP" [ "REC" drop "REC" ] label ] } [
+[ [ drop "WRAP" [ "REC" drop "REC" ] label ] ] [
     [ call-recursive-dce-1 ] optimize-quot squish
 ] unit-test
 
@@ -131,76 +131,76 @@ IN: compiler.tree.dead-code.tests
     drop
     produce-a-value dup . call-recursive-dce-2 ; inline recursive
 
-{ [ "WRAP" [ produce-a-value . "REC" ] label ] } [
+[ [ "WRAP" [ produce-a-value . "REC" ] label ] ] [
     [ f call-recursive-dce-2 drop ] optimize-quot squish
 ] unit-test
 
-{ [ "WRAP" [ produce-a-value . "REC" ] label ] } [
+[ [ "WRAP" [ produce-a-value . "REC" ] label ] ] [
     [ f call-recursive-dce-2 ] optimize-quot squish
 ] unit-test
 
 : call-recursive-dce-3 ( a -- )
     call-recursive-dce-3 ; inline recursive
 
-{ [ [ drop "WRAP" [ "REC" ] label ] [ . ] if ] } [
+[ [ [ drop "WRAP" [ "REC" ] label ] [ . ] if ] ] [
     [ [ call-recursive-dce-3 ] [ . ] if ] optimize-quot squish
 ] unit-test
 
-{ [ drop "WRAP" [ "REC" ] label ] } [
+[ [ drop "WRAP" [ "REC" ] label ] ] [
     [ call-recursive-dce-3 ] optimize-quot squish
 ] unit-test
 
 : call-recursive-dce-4 ( a -- b )
     call-recursive-dce-4 ; inline recursive
 
-{ [ drop "WRAP" [ "REC" ] label ] } [
+[ [ drop "WRAP" [ "REC" ] label ] ] [
     [ call-recursive-dce-4 ] optimize-quot squish
 ] unit-test
 
-{ [ drop "WRAP" [ "REC" ] label ] } [
+[ [ drop "WRAP" [ "REC" ] label ] ] [
     [ call-recursive-dce-4 drop ] optimize-quot squish
 ] unit-test
 
-{ } [ [ f call-recursive-dce-3 swap ] optimize-quot drop ] unit-test
+[ ] [ [ f call-recursive-dce-3 swap ] optimize-quot drop ] unit-test
 
 : call-recursive-dce-5 ( -- ) call-recursive-dce-5 ; inline recursive
 
-{ } [ [ call-recursive-dce-5 swap ] optimize-quot drop ] unit-test
+[ ] [ [ call-recursive-dce-5 swap ] optimize-quot drop ] unit-test
 
-{ } [ [ [ 0 -rot set-nth-unsafe ] curry (each-integer) ] optimize-quot drop ] unit-test
+[ ] [ [ [ 0 -rot set-nth-unsafe ] curry (each-integer) ] optimize-quot drop ] unit-test
 
 : call-recursive-dce-6 ( i quot: ( ..a -- ..b ) -- i )
     dup call [ drop ] [ call-recursive-dce-6 ] if ; inline recursive
 
-{ } [ [ [ ] curry [ ] swap compose call-recursive-dce-6 ] optimize-quot drop ] unit-test
+[ ] [ [ [ ] curry [ ] swap compose call-recursive-dce-6 ] optimize-quot drop ] unit-test
 
-{ } [ [ [ ] rot [ . ] curry pick [ roll 2drop call ] [ 2nip call ] if ] optimize-quot drop ] unit-test
+[ ] [ [ [ ] rot [ . ] curry pick [ roll 2drop call ] [ 2nip call ] if ] optimize-quot drop ] unit-test
 
-{ [ drop ] } [ [ array? drop ] optimize-quot ] unit-test
+[ [ drop ] ] [ [ array? drop ] optimize-quot ] unit-test
 
-{ [ drop ] } [ [ array instance? drop ] optimize-quot ] unit-test
+[ [ drop ] ] [ [ array instance? drop ] optimize-quot ] unit-test
 
-{ [ drop ] } [ [ { integer } declare f <array> drop ] optimize-quot ] unit-test
+[ [ drop ] ] [ [ { integer } declare f <array> drop ] optimize-quot ] unit-test
 
-{ [ f <array> drop ] } [ [ f <array> drop ] optimize-quot ] unit-test
+[ [ f <array> drop ] ] [ [ f <array> drop ] optimize-quot ] unit-test
 
 : call-recursive-dce-7 ( obj -- elt ? )
     dup 5 = [ t ] [ dup [ call-recursive-dce-7 ] [ drop f f ] if ] if ; inline recursive
 
-{ } [ [ call-recursive-dce-7 ] optimize-quot drop ] unit-test
+[ ] [ [ call-recursive-dce-7 ] optimize-quot drop ] unit-test
 
-{ [ /i ] } [ [ /mod drop ] optimize-quot ] unit-test
+[ [ /i ] ] [ [ /mod drop ] optimize-quot ] unit-test
 
-{ [ mod ] } [ [ /mod nip ] optimize-quot ] unit-test
+[ [ mod ] ] [ [ /mod nip ] optimize-quot ] unit-test
 
-{ [ fixnum/i ] } [ [ { fixnum fixnum } declare /mod drop ] optimize-quot ] unit-test
+[ [ fixnum/i ] ] [ [ { fixnum fixnum } declare /mod drop ] optimize-quot ] unit-test
 
-{ [ fixnum-mod ] } [ [ { fixnum fixnum } declare /mod nip ] optimize-quot ] unit-test
+[ [ fixnum-mod ] ] [ [ { fixnum fixnum } declare /mod nip ] optimize-quot ] unit-test
 
-{ [ bignum/i ] } [ [ { bignum bignum } declare /mod drop ] optimize-quot ] unit-test
+[ [ bignum/i ] ] [ [ { bignum bignum } declare /mod drop ] optimize-quot ] unit-test
 
-{ [ bignum-mod ] } [ [ { bignum bignum } declare /mod nip ] optimize-quot ] unit-test
+[ [ bignum-mod ] ] [ [ { bignum bignum } declare /mod nip ] optimize-quot ] unit-test
 
-{ [ /i ] } [ [ /mod drop ] optimize-quot ] unit-test
+[ [ /i ] ] [ [ /mod drop ] optimize-quot ] unit-test
 
-{ [ mod ] } [ [ /mod nip ] optimize-quot ] unit-test
+[ [ mod ] ] [ [ /mod nip ] optimize-quot ] unit-test