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

[factor.git] / core / assocs / assocs-tests.factor

diff --git a/core/assocs/assocs-tests.factor b/core/assocs/assocs-tests.factor
index 6e715a32489e91dccb5d3592e124303ac891b811..4dd3614cd24640c6796788c00e80f7ea8fec648e 100644 (file)
--- a/core/assocs/assocs-tests.factor
+++ b/core/assocs/assocs-tests.factor
@@ -4,18 +4,18 @@ continuations specialized-arrays alien.c-types ;
 SPECIALIZED-ARRAY: double
 IN: assocs.tests
 
-{ t } [ H{ } dup assoc-subset? ] unit-test
-{ f } [ H{ { 1 3 } } H{ } assoc-subset? ] unit-test
-{ t } [ H{ } H{ { 1 3 } } assoc-subset? ] unit-test
-{ t } [ H{ { 1 3 } } H{ { 1 3 } } assoc-subset? ] unit-test
-{ f } [ H{ { 1 3 } } H{ { 1 "hey" } } assoc-subset? ] unit-test
-{ f } [ H{ { 1 f } } H{ } assoc-subset? ] unit-test
-{ t } [ H{ { 1 f } } H{ { 1 f } } assoc-subset? ] unit-test
+[ t ] [ H{ } dup assoc-subset? ] unit-test
+[ f ] [ H{ { 1 3 } } H{ } assoc-subset? ] unit-test
+[ t ] [ H{ } H{ { 1 3 } } assoc-subset? ] unit-test
+[ t ] [ H{ { 1 3 } } H{ { 1 3 } } assoc-subset? ] unit-test
+[ f ] [ H{ { 1 3 } } H{ { 1 "hey" } } assoc-subset? ] unit-test
+[ f ] [ H{ { 1 f } } H{ } assoc-subset? ] unit-test
+[ t ] [ H{ { 1 f } } H{ { 1 f } } assoc-subset? ] unit-test
 
 ! Test some combinators
-{
+[
     { 4 14 32 }
-} [
+] [
     [
         H{
             { 1 2 }
@@ -25,42 +25,42 @@ IN: assocs.tests
     ] { } make
 ] unit-test
 
-{ t } [ H{ } [ 2drop f ] assoc-all? ] unit-test
-{ t } [ H{ { 1 1 } } [ = ] assoc-all? ] unit-test
-{ f } [ H{ { 1 2 } } [ = ] assoc-all? ] unit-test
-{ t } [ H{ { 1 1 } { 2 2 } } [ = ] assoc-all? ] unit-test
-{ f } [ H{ { 1 2 } { 2 2 } } [ = ] assoc-all? ] unit-test
+[ t ] [ H{ } [ 2drop f ] assoc-all? ] unit-test
+[ t ] [ H{ { 1 1 } } [ = ] assoc-all? ] unit-test
+[ f ] [ H{ { 1 2 } } [ = ] assoc-all? ] unit-test
+[ t ] [ H{ { 1 1 } { 2 2 } } [ = ] assoc-all? ] unit-test
+[ f ] [ H{ { 1 2 } { 2 2 } } [ = ] assoc-all? ] unit-test
 
-{ H{ } } [ H{ { t f } { f t } } [ 2drop f ] assoc-filter ] unit-test
-{ H{ } } [ H{ { t f } { f t } } clone dup [ 2drop f ] assoc-filter! drop ] unit-test
-{ H{ } } [ H{ { t f } { f t } } clone [ 2drop f ] assoc-filter! ] unit-test
+[ H{ } ] [ H{ { t f } { f t } } [ 2drop f ] assoc-filter ] unit-test
+[ H{ } ] [ H{ { t f } { f t } } clone dup [ 2drop f ] assoc-filter! drop ] unit-test
+[ H{ } ] [ H{ { t f } { f t } } clone [ 2drop f ] assoc-filter! ] unit-test
 
-{ H{ { 3 4 } { 4 5 } { 6 7 } } } [
+[ H{ { 3 4 } { 4 5 } { 6 7 } } ] [
     H{ { 1 2 } { 2 3 } { 3 4 } { 4 5 } { 6 7 } }
     [ drop 3 >= ] assoc-filter
 ] unit-test
 
-{ H{ { 3 4 } { 4 5 } { 6 7 } } } [
+[ H{ { 3 4 } { 4 5 } { 6 7 } } ] [
     H{ { 1 2 } { 2 3 } { 3 4 } { 4 5 } { 6 7 } } clone
     [ drop 3 >= ] assoc-filter!
 ] unit-test
 
-{ H{ { 3 4 } { 4 5 } { 6 7 } } } [
+[ H{ { 3 4 } { 4 5 } { 6 7 } } ] [
     H{ { 1 2 } { 2 3 } { 3 4 } { 4 5 } { 6 7 } } clone dup
     [ drop 3 >= ] assoc-filter! drop
 ] unit-test
 
-{ H{ { 1 2 } { 2 3 } } } [
+[ H{ { 1 2 } { 2 3 } } ] [
     H{ { 1 2 } { 2 3 } { 3 4 } { 4 5 } { 6 7 } }
     [ drop 3 >= ] assoc-reject
 ] unit-test
 
-{ H{ { 1 2 } { 2 3 } } } [
+[ H{ { 1 2 } { 2 3 } } ] [
     H{ { 1 2 } { 2 3 } { 3 4 } { 4 5 } { 6 7 } } clone
     [ drop 3 >= ] assoc-reject!
 ] unit-test
 
-{ 21 } [
+[ 21 ] [
     0 H{
         { 1 2 }
         { 3 4 }
@@ -72,83 +72,83 @@ IN: assocs.tests
 
 H{ } clone "cache-test" set
 
-{ 4 } [ 1 "cache-test" get [ 3 + ] cache ] unit-test
-{ 5 } [ 2 "cache-test" get [ 3 + ] cache ] unit-test
-{ 4 } [ 1 "cache-test" get [ 3 + ] cache ] unit-test
-{ 5 } [ 2 "cache-test" get [ 3 + ] cache ] unit-test
+[ 4 ] [ 1 "cache-test" get [ 3 + ] cache ] unit-test
+[ 5 ] [ 2 "cache-test" get [ 3 + ] cache ] unit-test
+[ 4 ] [ 1 "cache-test" get [ 3 + ] cache ] unit-test
+[ 5 ] [ 2 "cache-test" get [ 3 + ] cache ] unit-test
 
-{
+[
     H{ { "factor" "rocks" } { 3 4 } }
-} [
+] [
     H{ { "factor" "rocks" } { "dup" "sq" } { 3 4 } }
     H{ { "factor" "rocks" } { 1 2 } { 2 3 } { 3 4 } }
     assoc-intersect
 ] unit-test
 
-{
+[
     H{ { 1 2 } { 2 3 } { 6 5 } }
-} [
+] [
     H{ { 2 4 } { 6 5 } } H{ { 1 2 } { 2 3 } }
     assoc-union
 ] unit-test
 
-{
+[
     H{ { 1 2 } { 2 3 } { 6 5 } }
-} [
+] [
     H{ { 2 4 } { 6 5 } } clone dup H{ { 1 2 } { 2 3 } }
     assoc-union! drop
 ] unit-test
 
-{
+[
     H{ { 1 2 } { 2 3 } { 6 5 } }
-} [
+] [
     H{ { 2 4 } { 6 5 } } clone H{ { 1 2 } { 2 3 } }
     assoc-union!
 ] unit-test
 
-{ H{ { 1 2 } { 2 3 } } t } [
+[ H{ { 1 2 } { 2 3 } } t ] [
     f H{ { 1 2 } { 2 3 } } [ assoc-union ] 2keep swap assoc-union dupd =
 ] unit-test
 
-{
+[
     H{ { 1 f } }
-} [
+] [
     H{ { 1 f } } H{ { 1 f } } assoc-intersect
 ] unit-test
 
-{
+[
     H{ { 3 4 } }
-} [
+] [
     H{ { 1 2 } { 3 4 } } H{ { 1 3 } } assoc-diff
 ] unit-test
 
-{
+[
     H{ { 3 4 } }
-} [
+] [
     H{ { 1 2 } { 3 4 } } clone dup H{ { 1 3 } } assoc-diff! drop
 ] unit-test
 
-{
+[
     H{ { 3 4 } }
-} [
+] [
     H{ { 1 2 } { 3 4 } } clone H{ { 1 3 } } assoc-diff!
 ] unit-test
 
-{ H{ { "hi" 2 } { 3 4 } } }
+[ H{ { "hi" 2 } { 3 4 } } ]
 [ "hi" 1 H{ { 1 2 } { 3 4 } } clone [ rename-at ] keep ]
 unit-test
 
-{ H{ { 1 2 } { 3 4 } } }
+[ H{ { 1 2 } { 3 4 } } ]
 [ "hi" 5 H{ { 1 2 } { 3 4 } } clone [ rename-at ] keep ]
 unit-test
 
-{
+[
     H{ { 1.0 1.0 } { 2.0 2.0 } }
-} [
+] [
     double-array{ 1.0 2.0 } [ dup ] H{ } map>assoc
 ] unit-test
 
-{ { 3 } } [
+[ { 3 } ] [
     [
         3
         H{ } clone
@@ -159,12 +159,12 @@ unit-test
     ] { } make
 ] unit-test
 
-{
+[
     H{
         { "bangers" "mash" }
         { "fries" "onion rings" }
     }
-} [
+] [
     { "bangers" "fries" } H{
         { "fish" "chips" }
         { "bangers" "mash" }
@@ -173,7 +173,7 @@ unit-test
     } extract-keys
 ] unit-test
 
-{ H{ { "b" [ 2 ] } { "d" [ 4 ] } } H{ { "a" [ 1 ] } { "c" [ 3 ] } } } [
+[ H{ { "b" [ 2 ] } { "d" [ 4 ] } } H{ { "a" [ 1 ] } { "c" [ 3 ] } } ] [
     H{
         { "a" [ 1 ] }
         { "b" [ 2 ] }
@@ -182,14 +182,14 @@ unit-test
     } [ nip first even? ] assoc-partition
 ] unit-test
 
-{ 1 f } [ 1 H{ } ?at ] unit-test
-{ 2 t } [ 1 H{ { 1 2 } } ?at ] unit-test
+[ 1 f ] [ 1 H{ } ?at ] unit-test
+[ 2 t ] [ 1 H{ { 1 2 } } ?at ] unit-test
 
-{ f } [ 1 2 H{ { 2 1 } } maybe-set-at ] unit-test
-{ t } [ 1 3 H{ { 2 1 } } clone maybe-set-at ] unit-test
-{ t } [ 3 2 H{ { 2 1 } } clone maybe-set-at ] unit-test
+[ f ] [ 1 2 H{ { 2 1 } } maybe-set-at ] unit-test
+[ t ] [ 1 3 H{ { 2 1 } } clone maybe-set-at ] unit-test
+[ t ] [ 3 2 H{ { 2 1 } } clone maybe-set-at ] unit-test
 
-{ H{ { 1 2 } { 2 3 } } } [
+[ H{ { 1 2 } { 2 3 } } ] [
     {
         H{ { 1 3 } }
         H{ { 2 3 } }
@@ -197,7 +197,7 @@ unit-test
     } assoc-combine
 ] unit-test
 
-{ H{ { 1 7 } } } [
+[ H{ { 1 7 } } ] [
     {
         H{ { 1 2 } { 2 4 } { 5 6 } }
         H{ { 1 3 } { 2 5 } }
@@ -205,10 +205,10 @@ unit-test
     } assoc-refine
 ] unit-test
 
-{ f } [ "a" { } assoc-stack ] unit-test
-{ 1 } [ "a" { H{ { "a" 1 } } H{ { "b" 2 } } } assoc-stack ] unit-test
-{ 2 } [ "b" { H{ { "a" 1 } } H{ { "b" 2 } } } assoc-stack ] unit-test
-{ f } [ "c" { H{ { "a" 1 } } H{ { "b" 2 } } } assoc-stack ] unit-test
+[ f ] [ "a" { } assoc-stack ] unit-test
+[ 1 ] [ "a" { H{ { "a" 1 } } H{ { "b" 2 } } } assoc-stack ] unit-test
+[ 2 ] [ "b" { H{ { "a" 1 } } H{ { "b" 2 } } } assoc-stack ] unit-test
+[ f ] [ "c" { H{ { "a" 1 } } H{ { "b" 2 } } } assoc-stack ] unit-test
 
 
 {