Fix some tests broken by optimized? rename.

diff --git a/basis/compiler/tests/codegen.factor b/basis/compiler/tests/codegen.factor
index 2fd590e778ac6b75a547a69d208aaf1cdc24e51c..2e5ed643b2d1ddc7d3d5d5bf4cac0b304e5e3f57 100644 (file)
--- a/basis/compiler/tests/codegen.factor
+++ b/basis/compiler/tests/codegen.factor
@@ -201,7 +201,7 @@ TUPLE: my-tuple ;
     { tuple vector } 3 slot { word } declare
     dup 1 slot 0 fixnum-bitand { [ ] } dispatch ;
 
-[ t ] [ \ dispatch-alignment-regression optimized? ] unit-test
+[ t ] [ \ dispatch-alignment-regression word-optimized? ] unit-test
 
 [ vector ] [ dispatch-alignment-regression ] unit-test
 

diff --git a/basis/compiler/tests/optimizer.factor b/basis/compiler/tests/optimizer.factor
index a916c2953a8595a58d69b93ea8c3b74a6189a064..ae336a3689281248ae0e6322ed7621c350a0660c 100644 (file)
--- a/basis/compiler/tests/optimizer.factor
+++ b/basis/compiler/tests/optimizer.factor
@@ -12,7 +12,7 @@ IN: compiler.tests.optimizer
 GENERIC: xyz ( obj -- obj )
 M: array xyz xyz ;
 
-[ t ] [ M\ array xyz optimized? ] unit-test
+[ t ] [ M\ array xyz word-optimized? ] unit-test
 
 ! Test predicate inlining
 : pred-test-1 ( a -- b c )
@@ -97,7 +97,7 @@ TUPLE: pred-test ;
 ! regression
 GENERIC: void-generic ( obj -- * )
 : breakage ( -- * ) "hi" void-generic ;
-[ t ] [ \ breakage optimized? ] unit-test
+[ t ] [ \ breakage word-optimized? ] unit-test
 [ breakage ] must-fail
 
 ! regression
@@ -122,7 +122,7 @@ GENERIC: void-generic ( obj -- * )
 ! compiling <tuple> with a non-literal class failed
 : <tuple>-regression ( class -- tuple ) <tuple> ;
 
-[ t ] [ \ <tuple>-regression optimized? ] unit-test
+[ t ] [ \ <tuple>-regression word-optimized? ] unit-test
 
 ! regression
 : constant-fold-2 ( -- value ) f ; foldable
@@ -203,7 +203,7 @@ M: number detect-number ;
 : node-successor-f-bug ( x -- * )
     [ 3 throw ] [ empty-compound ] compose [ 3 throw ] if ;
 
-[ t ] [ \ node-successor-f-bug optimized? ] unit-test
+[ t ] [ \ node-successor-f-bug word-optimized? ] unit-test
 
 [ ] [ [ new ] build-tree optimize-tree drop ] unit-test
 
@@ -217,7 +217,7 @@ M: number detect-number ;
         ] if
     ] if ;
 
-[ t ] [ \ lift-throw-tail-regression optimized? ] unit-test
+[ t ] [ \ lift-throw-tail-regression word-optimized? ] unit-test
 [ 3 "an integer" ] [ 3 lift-throw-tail-regression ] unit-test
 [ "hi" "a string" ] [ "hi" lift-throw-tail-regression ] unit-test
 
@@ -248,7 +248,7 @@ HINTS: recursive-inline-hang array ;
 : recursive-inline-hang-1 ( -- a )
     { } recursive-inline-hang ;
 
-[ t ] [ \ recursive-inline-hang-1 optimized? ] unit-test
+[ t ] [ \ recursive-inline-hang-1 word-optimized? ] unit-test
 
 DEFER: recursive-inline-hang-3
 
@@ -302,7 +302,7 @@ PREDICATE: list < improper-list
     dup "a" get { array-capacity } declare >=
     [ dup "b" get { array-capacity } declare >= [ 3 ] [ 4 ] if ] [ 5 ] if ;
 
-[ t ] [ \ interval-inference-bug optimized? ] unit-test
+[ t ] [ \ interval-inference-bug word-optimized? ] unit-test
 
 [ ] [ 1 "a" set 2 "b" set ] unit-test
 [ 2 3 ] [ 2 interval-inference-bug ] unit-test
@@ -364,7 +364,7 @@ DEFER: loop-bbb
 
 : broken-declaration ( -- ) \ + declare ;
 
-[ f ] [ \ broken-declaration optimized? ] unit-test
+[ f ] [ \ broken-declaration word-optimized? ] unit-test
 
 [ ] [ [ \ broken-declaration forget ] with-compilation-unit ] unit-test
 

diff --git a/basis/compiler/tests/peg-regression.factor b/basis/compiler/tests/peg-regression.factor
index 95d454fed18d1b6ec12a1a02b7f6e0a5d448432c..b01c2ce5ea8cabdae2eb04b668fde55779bc37f2 100644 (file)
--- a/basis/compiler/tests/peg-regression.factor
+++ b/basis/compiler/tests/peg-regression.factor
@@ -22,5 +22,5 @@ pipeline = "hello" => [[ ast>pipeline-expr ]]
 
 USE: tools.test
 
-[ t ] [ \ expr optimized? ] unit-test
-[ t ] [ \ ast>pipeline-expr optimized? ] unit-test
+[ t ] [ \ expr word-optimized? ] unit-test
+[ t ] [ \ ast>pipeline-expr word-optimized? ] unit-test

diff --git a/basis/compiler/tests/redefine3.factor b/basis/compiler/tests/redefine3.factor
index b8915c84bbc6f7b301d7ff7f989a5650d8af51a4..84713612f5425965d961bd0b05e6cdba466d49a5 100644 (file)
--- a/basis/compiler/tests/redefine3.factor
+++ b/basis/compiler/tests/redefine3.factor
@@ -17,7 +17,7 @@ M: empty-mixin sheeple drop "wake up" ; inline
     "definition-dependencies" word-prop member-eq? ;
 
 [ "sheeple" ] [ sheeple-test ] unit-test
-[ t ] [ \ sheeple-test optimized? ] 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
 
@@ -30,6 +30,6 @@ M: empty-mixin sheeple drop "wake up" ; inline
 [ ] [ [ array empty-mixin remove-mixin-instance ] with-compilation-unit ] unit-test
 
 [ "sheeple" ] [ sheeple-test ] unit-test
-[ t ] [ \ sheeple-test optimized? ] 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/simple.factor b/basis/compiler/tests/simple.factor
index 8b1fc3569f4ce3fdf425f005b68fc11848ac7786..5406072f10a7f2fff191136e12f24c4e03442541 100644 (file)
--- a/basis/compiler/tests/simple.factor
+++ b/basis/compiler/tests/simple.factor
@@ -236,7 +236,11 @@ M: f single-combination-test-2 single-combination-test-4 ;
 10 [
     [ "compiler.tests.foo" forget-vocab ] with-compilation-unit
     [ t ] [
-        "USING: prettyprint words accessors ; IN: compiler.tests.foo : (recursive) ( -- ) (recursive) (recursive) ; inline recursive : recursive ( -- ) (recursive) ; \\ (recursive) optimized?" eval( -- obj )
+        "USING: prettyprint words accessors ;
+        IN: compiler.tests.foo
+        : (recursive) ( -- ) (recursive) (recursive) ; inline recursive
+        : recursive ( -- ) (recursive) ;
+        \\ (recursive) word-optimized?" eval( -- obj )
     ] unit-test
 ] times
 

diff --git a/basis/compiler/tests/spilling.factor b/basis/compiler/tests/spilling.factor
index 2e4c48f930eecb3b88b9c6f15d35c3059abe6db7..897c182488c7fa046db4738d0def00696989b30d 100644 (file)
--- a/basis/compiler/tests/spilling.factor
+++ b/basis/compiler/tests/spilling.factor
@@ -49,7 +49,7 @@ IN: compiler.tests.spilling
 [ 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 2.0 ]
 [ 1.0 float-spill-bug ] unit-test
 
-[ t ] [ \ float-spill-bug optimized? ] unit-test
+[ t ] [ \ float-spill-bug word-optimized? ] unit-test
 
 : float-fixnum-spill-bug ( object -- object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object object )
     {
@@ -134,7 +134,7 @@ IN: compiler.tests.spilling
 [ 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 2.0 2 ]
 [ 1.0 float-fixnum-spill-bug ] unit-test
 
-[ t ] [ \ float-fixnum-spill-bug optimized? ] unit-test
+[ t ] [ \ float-fixnum-spill-bug word-optimized? ] unit-test
 
 : resolve-spill-bug ( a b -- c )
     [ 1 fixnum+fast ] bi@ dup 10 fixnum< [
@@ -161,7 +161,7 @@ IN: compiler.tests.spilling
         16 narray
     ] if ;
 
-[ t ] [ \ resolve-spill-bug optimized? ] unit-test
+[ t ] [ \ resolve-spill-bug word-optimized? ] unit-test
 
 [ 4 ] [ 1 1 resolve-spill-bug ] unit-test
 

diff --git a/basis/locals/locals-tests.factor b/basis/locals/locals-tests.factor
index 227076eca5d9599ea7e9095c79b32e11310da8d9..ade3c2f650c37cf9175584d413e10dbdc8ad0d7e 100644 (file)
--- a/basis/locals/locals-tests.factor
+++ b/basis/locals/locals-tests.factor
@@ -488,7 +488,7 @@ M: integer ed's-bug neg ;
 :: ed's-test-case ( a -- b )
    { [ a ed's-bug ] } && ;
 
-{ t } [ \ ed's-test-case optimized? ] unit-test
+{ t } [ \ ed's-test-case word-optimized? ] unit-test
 
 ! multiple bind
 { 3 1 2 } [ [let 1 2 3 :> ( a b c ) c a b ] ] unit-test

diff --git a/basis/tools/walker/walker-tests.factor b/basis/tools/walker/walker-tests.factor
index 55b2ba5f837da65f49c0e58d714de5f717e7654b..319162c7edea5a672938841b083fe8962de9e03a 100644 (file)
--- a/basis/tools/walker/walker-tests.factor
+++ b/basis/tools/walker/walker-tests.factor
@@ -118,7 +118,7 @@ IN: tools.walker.tests
 
 \ breakpoint-test don't-step-into
 
-{ f } [ \ breakpoint-test optimized? ] unit-test
+{ f } [ \ breakpoint-test word-optimized? ] unit-test
 
 { { 3 } } [ [ breakpoint-test ] test-walker ] unit-test
 

diff --git a/core/combinators/combinators-tests.factor b/core/combinators/combinators-tests.factor
index f511d5ba04b506498202f8d57fbae3c31d7a48ba..7acb32f5994b2cfca82d9687cbe2fe81dab26ecb 100644 (file)
--- a/core/combinators/combinators-tests.factor
+++ b/core/combinators/combinators-tests.factor
@@ -16,12 +16,12 @@ IN: combinators.tests
 
 : compile-execute(-test-1 ( a b -- c ) \ + execute( a b -- c ) ;
 
-{ t } [ \ compile-execute(-test-1 optimized? ] unit-test
+{ t } [ \ compile-execute(-test-1 word-optimized? ] unit-test
 { 4 } [ 1 3 compile-execute(-test-1 ] unit-test
 
 : compile-execute(-test-2 ( a b w -- c ) execute( a b -- c ) ;
 
-{ t } [ \ compile-execute(-test-2 optimized? ] unit-test
+{ t } [ \ compile-execute(-test-2 word-optimized? ] unit-test
 { 4 } [ 1 3 \ + compile-execute(-test-2 ] unit-test
 { 5 } [ 1 4 \ + compile-execute(-test-2 ] unit-test
 { -3 } [ 1 4 \ - compile-execute(-test-2 ] unit-test
@@ -29,7 +29,7 @@ IN: combinators.tests
 
 : compile-call(-test-1 ( a b q -- c ) call( a b -- c ) ;
 
-{ t } [ \ compile-call(-test-1 optimized? ] unit-test
+{ t } [ \ compile-call(-test-1 word-optimized? ] unit-test
 { 4 } [ 1 3 [ + ] compile-call(-test-1 ] unit-test
 { 7 } [ 1 3 2 [ * + ] curry compile-call(-test-1 ] unit-test
 { 7 } [ 1 3 [ 2 * ] [ + ] compose compile-call(-test-1 ] unit-test
@@ -256,7 +256,7 @@ DEFER: corner-case-1
 
 << \ corner-case-1 2 [ + ] curry 1array [ case ] curry ( a -- b ) define-declared >>
 
-{ t } [ \ corner-case-1 optimized? ] unit-test
+{ t } [ \ corner-case-1 word-optimized? ] unit-test
 
 { 4 } [ 2 corner-case-1 ] unit-test
 { 4 } [ 2 \ corner-case-1 def>> call ] unit-test