factor: second stab at [ ] [ ] unit-test -> { } [ ] unit-test

[factor.git] / basis / compiler / cfg / alias-analysis / alias-analysis-tests.factor

diff --git a/basis/compiler/cfg/alias-analysis/alias-analysis-tests.factor b/basis/compiler/cfg/alias-analysis/alias-analysis-tests.factor
index 21241e6f4ad10507927a7aacbddfbace19160feb..498788721e2a99690152b50900e9c08ac8e3a5d9 100644 (file)
--- a/basis/compiler/cfg/alias-analysis/alias-analysis-tests.factor
+++ b/basis/compiler/cfg/alias-analysis/alias-analysis-tests.factor
@@ -10,13 +10,13 @@ IN: compiler.cfg.alias-analysis.tests
     [ f >>insn# ] map ;
 
 ! Redundant load elimination
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
         T{ ##copy f 2 1 any-rep }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
@@ -25,14 +25,14 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Store-load forwarding
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
         T{ ##set-slot-imm f 1 0 1 0 }
         T{ ##copy f 2 1 any-rep }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -42,14 +42,14 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Dead store elimination
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
         T{ ##peek f 2 D 2 }
         T{ ##set-slot-imm f 2 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -59,7 +59,7 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -67,7 +67,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##peek f 3 D 3 }
         T{ ##set-slot-imm f 3 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -80,12 +80,12 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Redundant store elimination
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
@@ -93,13 +93,13 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
         T{ ##copy f 2 1 any-rep }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
@@ -109,7 +109,7 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Not a redundant load
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -117,7 +117,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##set-slot-imm f 0 1 1 0 }
         T{ ##slot-imm f 2 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -128,7 +128,7 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Not a redundant store
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -138,7 +138,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##slot-imm f 4 0 1 0 }
         T{ ##set-slot-imm f 3 1 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -151,7 +151,7 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! There's a redundant load, but not a redundant store
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -163,7 +163,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##set-slot-imm f 3 0 1 0 }
         T{ ##copy f 6 3 any-rep }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -180,7 +180,7 @@ IN: compiler.cfg.alias-analysis.tests
 ! Fresh allocations don't alias existing values
 
 ! Redundant load elimination
-[
+{
     V{
         T{ ##peek f 1 D 1 }
         T{ ##peek f 2 D 2 }
@@ -190,7 +190,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##set-slot-imm f 2 1 1 0 }
         T{ ##copy f 5 3 any-rep }
     }
-] [
+} [
     V{
         T{ ##peek f 1 D 1 }
         T{ ##peek f 2 D 2 }
@@ -203,7 +203,7 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Redundant store elimination
-[
+{
     V{
         T{ ##peek f 1 D 1 }
         T{ ##peek f 2 D 2 }
@@ -212,7 +212,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##slot-imm f 5 1 1 0 }
         T{ ##set-slot-imm f 3 4 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 1 D 1 }
         T{ ##peek f 2 D 2 }
@@ -226,7 +226,7 @@ IN: compiler.cfg.alias-analysis.tests
 
 ! Storing a new alias class into another object means that heap-ac
 ! can now alias the new ac
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -239,7 +239,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##set-slot-imm f 1 5 1 0 }
         T{ ##slot-imm f 6 4 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -255,13 +255,13 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Compares between objects which cannot alias are eliminated
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##allot f 1 16 array }
         T{ ##load-reference f 2 f }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##allot f 1 16 array }
@@ -270,7 +270,7 @@ IN: compiler.cfg.alias-analysis.tests
 ] unit-test
 
 ! Make sure that input to ##box-displaced-alien becomes heap-ac
-[
+{
     V{
         T{ ##allot f 1 16 byte-array }
         T{ ##load-reference f 2 10 }
@@ -278,7 +278,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##slot-imm f 5 3 1 $[ alien type-number ] }
         T{ ##compare f 6 5 1 cc= }
     }
-] [
+} [
     V{
         T{ ##allot f 1 16 byte-array }
         T{ ##load-reference f 2 10 }
@@ -290,14 +290,14 @@ IN: compiler.cfg.alias-analysis.tests
 
 ! We can't make any assumptions about heap-ac between
 ! instructions which can call back into Factor code
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
         T{ ##slot-imm f 2 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
@@ -306,7 +306,7 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -314,7 +314,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
         T{ ##slot-imm f 2 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -324,7 +324,7 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -333,7 +333,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
         T{ ##set-slot-imm f 2 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##peek f 1 D 1 }
@@ -344,14 +344,14 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
         T{ ##set-slot-imm f 1 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##peek f 0 D 0 }
         T{ ##slot-imm f 1 0 1 0 }
@@ -362,14 +362,14 @@ IN: compiler.cfg.alias-analysis.tests
 
 ! We can't eliminate stores on any alias class across a GC-ing
 ! instruction
-[
+{
     V{
         T{ ##allot f 0 }
         T{ ##slot-imm f 1 0 1 0 }
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
         T{ ##copy f 2 1 any-rep }
     }
-] [
+} [
     V{
         T{ ##allot f 0 }
         T{ ##slot-imm f 1 0 1 0 }
@@ -378,7 +378,7 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##allot f 0 }
         T{ ##peek f 1 D 1 }
@@ -386,7 +386,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
         T{ ##copy f 2 1 any-rep }
     }
-] [
+} [
     V{
         T{ ##allot f 0 }
         T{ ##peek f 1 D 1 }
@@ -396,7 +396,7 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##allot f 0 }
         T{ ##peek f 1 D 1 }
@@ -405,7 +405,7 @@ IN: compiler.cfg.alias-analysis.tests
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
         T{ ##set-slot-imm f 2 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##allot f 0 }
         T{ ##peek f 1 D 1 }
@@ -416,13 +416,13 @@ IN: compiler.cfg.alias-analysis.tests
     } test-alias-analysis
 ] unit-test
 
-[
+{
     V{
         T{ ##allot f 0 }
         T{ ##slot-imm f 1 0 1 0 }
         T{ ##alien-invoke f { } { } { } { } 0 0 "free" }
     }
-] [
+} [
     V{
         T{ ##allot f 0 }
         T{ ##slot-imm f 1 0 1 0 }
@@ -433,13 +433,13 @@ IN: compiler.cfg.alias-analysis.tests
 
 ! Make sure that gc-map-insns which are also vreg-insns are
 ! handled properly
-[
+{
     V{
         T{ ##allot f 0 }
         T{ ##alien-indirect f { } { } { { 2 double-rep 0 } } { } 0 0 "free" }
         T{ ##set-slot-imm f 2 0 1 0 }
     }
-] [
+} [
     V{
         T{ ##allot f 0 }
         T{ ##alien-indirect f { } { } { { 2 double-rep 0 } } { } 0 0 "free" }