stomp.cli: simplify

[factor.git] / basis / compiler / cfg / linear-scan / linear-scan-tests.factor

diff --git a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
index 9951cdb2120f7fb2eb5344ab0a9bbe2f695946d9..8438faa597c1d58f1995a3e7ebd567c4ecdb26e4 100644 (file)
--- a/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
+++ b/basis/compiler/cfg/linear-scan/linear-scan-tests.factor
@@ -1,5 +1,5 @@
 USING: tools.test random sorting sequences hashtables assocs
-kernel fry arrays splitting namespaces math accessors vectors locals
+kernel arrays splitting namespaces math accessors vectors
 math.order grouping strings strings.private classes layouts
 cpu.architecture
 compiler.cfg
@@ -64,7 +64,7 @@ H{
 } representations set
 
 : clean-up-split ( a b -- a b )
-    [ dup [ [ >vector ] change-uses [ >vector ] change-ranges ] when ] bi@ ;
+    [ [ [ >vector ] change-uses [ >vector ] change-ranges ] ?call ] bi@ ;
 
 {
     T{ live-interval-state
@@ -298,7 +298,7 @@ H{
               T{ live-interval-state
                  { vreg 1 }
                  { reg 1 }
-                 { ranges { { 1 15 } } }
+                 { ranges V{ { 1 15 } } }
                  { uses
                    V{
                        T{ vreg-use f 1 int-rep f }
@@ -312,7 +312,7 @@ H{
               T{ live-interval-state
                  { vreg 2 }
                  { reg 2 }
-                 { ranges { { 3 8 } } }
+                 { ranges V{ { 3 8 } } }
                  { uses
                    V{
                        T{ vreg-use f 3 int-rep f }
@@ -324,7 +324,7 @@ H{
               T{ live-interval-state
                  { vreg 3 }
                  { reg 3 }
-                 { ranges { { 3 10 } } }
+                 { ranges V{ { 3 10 } } }
                  { uses V{ T{ vreg-use f 3 int-rep f } T{ vreg-use f 10 f int-rep } } }
               }
           }
@@ -333,7 +333,7 @@ H{
     H{ } inactive-intervals set
     T{ live-interval-state
        { vreg 1 }
-       { ranges { { 5 5 } } }
+       { ranges V{ { 5 5 } } }
        { uses V{ T{ vreg-use f 5 int-rep f } } }
     }
     spill-status
@@ -351,7 +351,7 @@ H{
               T{ live-interval-state
                  { vreg 1 }
                  { reg 1 }
-                 { ranges { { 1 15 } } }
+                 { ranges V{ { 1 15 } } }
                  { uses V{ T{ vreg-use f 1 int-rep f } } }
               }
               T{ live-interval-state
@@ -365,7 +365,7 @@ H{
     H{ } inactive-intervals set
     T{ live-interval-state
        { vreg 3 }
-       { ranges { { 5 5 } } }
+       { ranges V{ { 5 5 } } }
        { uses V{ T{ vreg-use f 5 int-rep f } } }
     }
     spill-status