Fixing unit tests for eval word being moved

diff --git a/basis/delegate/delegate-tests.factor b/basis/delegate/delegate-tests.factor
index bc173ab0c85c3aa7191ef3eb9bfedaf4960dfc23..09a90121bdddcd1bde36682b9698787b1fc8d6ee 100755 (executable)
--- a/basis/delegate/delegate-tests.factor
+++ b/basis/delegate/delegate-tests.factor
@@ -1,6 +1,6 @@
 USING: delegate kernel arrays tools.test words math definitions
 compiler.units parser generic prettyprint io.streams.string
-accessors ;
+accessors eval ;
 IN: delegate.tests
 
 TUPLE: hello this that ;

diff --git a/basis/help/crossref/crossref-tests.factor b/basis/help/crossref/crossref-tests.factor
index 1d569d8a8fdaaf00b56fa9668e0425479c746410..2e8c17394421986424030a5902d5b9577548c6ca 100755 (executable)
--- a/basis/help/crossref/crossref-tests.factor
+++ b/basis/help/crossref/crossref-tests.factor
@@ -1,7 +1,7 @@
 IN: help.crossref.tests
 USING: help.crossref help.topics help.markup tools.test words
 definitions assocs sequences kernel namespaces parser arrays
-io.streams.string continuations debugger compiler.units ;
+io.streams.string continuations debugger compiler.units eval ;
 
 [ ] [
     "IN: help.crossref.tests USING: help.syntax help.markup ; : foo ; HELP: foo \"foo is great\" ; ARTICLE: \"foo\" \"Foo\" { $subsection foo } ;" eval

diff --git a/basis/help/definitions/definitions-tests.factor b/basis/help/definitions/definitions-tests.factor
index 7134c6b0b0be1964f478c2a0ac0d2bfc30de2902..2c894c3812d72c7cc33c61d02a4913dca6bc2abf 100755 (executable)
--- a/basis/help/definitions/definitions-tests.factor
+++ b/basis/help/definitions/definitions-tests.factor
@@ -1,6 +1,6 @@
 USING: math definitions help.topics help tools.test
 prettyprint parser io.streams.string kernel source-files
-assocs namespaces words io sequences ;
+assocs namespaces words io sequences eval ;
 IN: help.definitions.tests
 
 [ ] [ \ + >link see ] unit-test

diff --git a/basis/help/syntax/syntax-tests.factor b/basis/help/syntax/syntax-tests.factor
index 5d8a1a0b78ff5caa0f1cb033d88c4323f56c718d..68306263a59e4c412119e014c26cb3bdee790ba4 100755 (executable)
--- a/basis/help/syntax/syntax-tests.factor
+++ b/basis/help/syntax/syntax-tests.factor
@@ -1,5 +1,5 @@
 IN: help.syntax.tests
-USING: tools.test parser vocabs help.syntax namespaces ;
+USING: tools.test parser vocabs help.syntax namespaces eval ;
 
 [
     [ "foobar" ] [

diff --git a/basis/help/topics/topics-tests.factor b/basis/help/topics/topics-tests.factor
index 1099f747bc759aefc2cca1f66db891dd18e7c450..a343aa1734a2c3b404351102964b1171fe4fb5c1 100644 (file)
--- a/basis/help/topics/topics-tests.factor
+++ b/basis/help/topics/topics-tests.factor
@@ -1,6 +1,6 @@
 USING: definitions help help.topics help.crossref help.markup
 help.syntax kernel sequences tools.test words parser namespaces
-assocs source-files ;
+assocs source-files eval ;
 IN: help.topics.tests
 
 ! Test help cross-referencing

diff --git a/basis/inference/inference-tests.factor b/basis/inference/inference-tests.factor
index d66821e230c3ee01361539ab1faa0077079fba2a..22a384f2358017e79fad1a7bf203328658327894 100755 (executable)
--- a/basis/inference/inference-tests.factor
+++ b/basis/inference/inference-tests.factor
@@ -5,7 +5,7 @@ sequences strings vectors words quotations effects tools.test
 continuations generic.standard sorting assocs definitions
 prettyprint io inspector classes.tuple classes.union
 classes.predicate debugger threads.private io.streams.string
-io.timeouts io.thread sequences.private destructors ;
+io.timeouts io.thread sequences.private destructors eval ;
 IN: inference.tests
 
 [ ] [ [ 1 ] dataflow [ ] transform-nodes drop ] unit-test

diff --git a/basis/libc/libc-tests.factor b/basis/libc/libc-tests.factor
index 249399bdd08f978b6b12b281c29caab1ea5c6b64..b00463127fd78f72d8bf653b6e76af0cd80fae4c 100755 (executable)
--- a/basis/libc/libc-tests.factor
+++ b/basis/libc/libc-tests.factor
@@ -4,8 +4,8 @@ destructors kernel ;
 \r
 100 malloc "block" set\r
 \r
-[ t ] [ "block" get mallocs get key? ] unit-test\r
+[ t ] [ "block" get mallocs key? ] unit-test\r
 \r
 [ ] [ [ "block" get &free drop ] with-destructors ] unit-test\r
 \r
-[ f ] [ "block" get mallocs get key? ] unit-test\r
+[ f ] [ "block" get mallocs key? ] unit-test\r

diff --git a/basis/listener/listener-tests.factor b/basis/listener/listener-tests.factor
index 24449049e02fbf706a7c4bf25c11226a7a575220..e681bac3145061290e42d2f3ca7c3e2d57494c00 100755 (executable)
--- a/basis/listener/listener-tests.factor
+++ b/basis/listener/listener-tests.factor
@@ -1,6 +1,6 @@
 USING: io io.streams.string io.streams.duplex listener
 tools.test parser math namespaces continuations vocabs kernel
-compiler.units ;
+compiler.units eval ;
 IN: listener.tests
 
 : hello "Hi" print ; parsing

diff --git a/basis/macros/macros-tests.factor b/basis/macros/macros-tests.factor
index 91527c2125e871de354b923931130a015e582795..150fd9eeaa9263a1a9e8046588b408f69d2c3954 100644 (file)
--- a/basis/macros/macros-tests.factor
+++ b/basis/macros/macros-tests.factor
@@ -1,6 +1,6 @@
 IN: macros.tests
 USING: tools.test macros math kernel arrays
-vectors io.streams.string prettyprint parser ;
+vectors io.streams.string prettyprint parser eval ;
 
 MACRO: see-test ( a b -- c ) + ;
 

diff --git a/basis/memoize/memoize-tests.factor b/basis/memoize/memoize-tests.factor
index c2592b38ca2246badead5cb6917e2d681d0b36f9..1f819d281df998fa318c4d6199d45a935129531e 100644 (file)
--- a/basis/memoize/memoize-tests.factor
+++ b/basis/memoize/memoize-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: math kernel memoize tools.test parser
-prettyprint io.streams.string sequences ;
+prettyprint io.streams.string sequences eval ;
 IN: memoize.tests
 
 MEMO: fib ( m -- n )

diff --git a/basis/mirrors/mirrors-tests.factor b/basis/mirrors/mirrors-tests.factor
index 879ec55861cb7d77d6e8125adfbd7ee585fca86d..2eda136ae5610864fc7f42a2744133c377e1d6d2 100755 (executable)
--- a/basis/mirrors/mirrors-tests.factor
+++ b/basis/mirrors/mirrors-tests.factor
@@ -1,5 +1,5 @@
 USING: mirrors tools.test assocs kernel arrays accessors words
-namespaces math slots parser ;
+namespaces math slots parser eval ;
 IN: mirrors.tests
 
 TUPLE: foo bar baz ;

diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor
index fd76b87dbb216cdd6d427340c672f7abe1f74c5a..534ab0fd09fb894a22cd173c9db07ddfdb5e83d9 100755 (executable)
--- a/basis/prettyprint/prettyprint-tests.factor
+++ b/basis/prettyprint/prettyprint-tests.factor
@@ -2,7 +2,7 @@ USING: arrays definitions io.streams.string io.streams.duplex
 kernel math namespaces parser prettyprint prettyprint.config
 prettyprint.sections sequences tools.test vectors words
 effects splitting generic.standard prettyprint.private
-continuations generic compiler.units tools.walker ;
+continuations generic compiler.units tools.walker eval ;
 IN: prettyprint.tests
 
 [ "4" ] [ 4 unparse ] unit-test
@@ -194,7 +194,7 @@ DEFER: parse-error-file
 
 : string-layout
     {
-        "USING: io kernel lexer ;"
+        "USING: debugger io kernel lexer ;"
         "IN: prettyprint.tests"
         ": string-layout-test ( error -- )"
         "    \"Expected \" write dup unexpected-want expected>string write"

diff --git a/basis/symbols/symbols-tests.factor b/basis/symbols/symbols-tests.factor
index 1ae4a38cb766065128c43d25c1dde799a7753f6c..274c4de85ba3989537d1293683b02a884312e2f7 100755 (executable)
--- a/basis/symbols/symbols-tests.factor
+++ b/basis/symbols/symbols-tests.factor
@@ -1,4 +1,5 @@
-USING: kernel symbols tools.test parser generic words accessors ;
+USING: kernel symbols tools.test parser generic words accessors
+eval ;
 IN: symbols.tests
 
 [ ] [ SYMBOLS: a b c ; ] unit-test

diff --git a/basis/tools/annotations/annotations-tests.factor b/basis/tools/annotations/annotations-tests.factor
index ec8f48a161fab7a6b9847ba3076f2e7efa2c9ae2..2bdcab50cb28d48e5ddc204e3833152d92beaacc 100755 (executable)
--- a/basis/tools/annotations/annotations-tests.factor
+++ b/basis/tools/annotations/annotations-tests.factor
@@ -1,4 +1,4 @@
-USING: tools.test tools.annotations math parser ;
+USING: tools.test tools.annotations math parser eval ;
 IN: tools.annotations.tests
 
 : foo ;

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 7559b448327a00ab204dbda5ed7926ded5b65970..723f9461a80436c68781bd7881a55ea279b09667 100755 (executable)
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -42,6 +42,7 @@ IN: tools.deploy.backend
 
 : bootstrap-profile ( -- profile )
     {
+        { "threads"  deploy-threads?  }
         { "math"     deploy-math?     }
         { "compiler" deploy-compiler? }
         { "ui"       deploy-ui?       }

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index a3fc08554cd98915281734744782be846c6a6a41..7a4d93c4bd69c1b67baed3e432a28d136dbf87e4 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -21,7 +21,6 @@ QUALIFIED: libc.private
 QUALIFIED: listener
 QUALIFIED: prettyprint.config
 QUALIFIED: source-files
-QUALIFIED: threads
 QUALIFIED: vocabs
 IN: tools.deploy.shaker
 
@@ -187,7 +186,7 @@ IN: tools.deploy.shaker
         } %
 
         deploy-threads? [
-            threads:initial-thread ,
+            "initial-thread" "threads" lookup ,
         ] unless
 
         strip-io? [ io.backend:io-backend , ] when

diff --git a/core/classes/mixin/mixin-tests.factor b/core/classes/mixin/mixin-tests.factor
index b455676c382915d20ddf482f3b67f7749cb0d776..f6ca9184b266b4aca61cfc9c7f02befa8ada2dde 100644 (file)
--- a/core/classes/mixin/mixin-tests.factor
+++ b/core/classes/mixin/mixin-tests.factor
@@ -3,7 +3,7 @@ kernel math namespaces parser prettyprint sequences strings
 tools.test vectors words quotations classes
 classes.private classes.union classes.mixin classes.predicate
 classes.algebra vectors definitions source-files
-compiler.units kernel.private sorting vocabs ;
+compiler.units kernel.private sorting vocabs eval ;
 IN: classes.mixin.tests
 
 ! Test mixins

diff --git a/core/classes/tuple/parser/parser-tests.factor b/core/classes/tuple/parser/parser-tests.factor
index 6f7d4af6bc3c14232b1672e6e089ae46cc63c121..7b0cb998e4b66a9a8ad6685849921784cff96786 100644 (file)
--- a/core/classes/tuple/parser/parser-tests.factor
+++ b/core/classes/tuple/parser/parser-tests.factor
@@ -1,7 +1,7 @@
 IN: classes.tuple.parser.tests
 USING: accessors classes.tuple.parser lexer words classes
 sequences math kernel slots tools.test parser compiler.units
-arrays classes.tuple ;
+arrays classes.tuple eval ;
 
 TUPLE: test-1 ;
 

diff --git a/core/classes/tuple/tuple-tests.factor b/core/classes/tuple/tuple-tests.factor
index 35d4149d37b8f649a9e4608b6d325f0d52283d9b..dc83a15e9bce1ed6b3302d0c0a13739e021232aa 100755 (executable)
--- a/core/classes/tuple/tuple-tests.factor
+++ b/core/classes/tuple/tuple-tests.factor
@@ -4,7 +4,7 @@ namespaces quotations sequences.private classes continuations
 generic.standard effects classes.tuple classes.tuple.private
 arrays vectors strings compiler.units accessors classes.algebra
 calendar prettyprint io.streams.string splitting summary
-columns math.order classes.private slots slots.private ;
+columns math.order classes.private slots slots.private eval ;
 IN: classes.tuple.tests
 
 TUPLE: rect x y w h ;

diff --git a/core/classes/union/union-tests.factor b/core/classes/union/union-tests.factor
index 4fd8cf643e2af18d971e2bdd33f73f62aad3009a..97baf08874a754f43d3b95ab8e9c67a682c45698 100644 (file)
--- a/core/classes/union/union-tests.factor
+++ b/core/classes/union/union-tests.factor
@@ -3,7 +3,8 @@ kernel math namespaces parser prettyprint sequences strings
 tools.test vectors words quotations classes
 classes.private classes.union classes.mixin classes.predicate
 classes.algebra vectors definitions source-files
-compiler.units kernel.private sorting vocabs io.streams.string ;
+compiler.units kernel.private sorting vocabs io.streams.string
+eval ;
 IN: classes.union.tests
 
 ! DEFER: bah

diff --git a/core/continuations/continuations-tests.factor b/core/continuations/continuations-tests.factor
index c292cf7691ca4a0c28d294102fd1dcfd996b0b41..28658d67d779c62ffe47a3424735721f3db3b523 100755 (executable)
--- a/core/continuations/continuations-tests.factor
+++ b/core/continuations/continuations-tests.factor
@@ -1,6 +1,6 @@
 USING: kernel math namespaces io tools.test sequences vectors
 continuations debugger parser memory arrays words
-kernel.private accessors ;
+kernel.private accessors eval ;
 IN: continuations.tests
 
 : (callcc1-test)

diff --git a/core/generic/generic-tests.factor b/core/generic/generic-tests.factor
index f3c51506fb84904770ddbac9c910388e17a8a4a8..5927927122048b24d4a4dced342c0347badceaa5 100755 (executable)
--- a/core/generic/generic-tests.factor
+++ b/core/generic/generic-tests.factor
@@ -2,7 +2,7 @@ USING: accessors alien arrays definitions generic generic.standard
 generic.math assocs hashtables io kernel math namespaces parser
 prettyprint sequences strings tools.test vectors words
 quotations classes classes.algebra classes.tuple continuations
-layouts classes.union sorting compiler.units ;
+layouts classes.union sorting compiler.units eval ;
 IN: generic.tests
 
 GENERIC: foobar ( x -- y )

diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor
index 074b3738acef0c61ab7472b8e793e94c9b07b92f..2d4073d10761bfed22498f968f51c4d14856b941 100755 (executable)
--- a/core/parser/parser-tests.factor
+++ b/core/parser/parser-tests.factor
@@ -2,7 +2,7 @@ USING: arrays math parser tools.test kernel generic words
 io.streams.string namespaces classes effects source-files
 assocs sequences strings io.files definitions continuations
 sorting classes.tuple compiler.units debugger vocabs
-vocabs.loader accessors ;
+vocabs.loader accessors eval combinators ;
 
 IN: parser.tests
 

diff --git a/core/slots/slots-tests.factor b/core/slots/slots-tests.factor
index c1d2a5cf9b00fb325783402ae70e5e8c3d02925c..4f4a0cadad627f36825507b8074f45259dbcf207 100644 (file)
--- a/core/slots/slots-tests.factor
+++ b/core/slots/slots-tests.factor
@@ -1,6 +1,6 @@
 IN: slots.tests
 USING: math accessors slots strings generic.standard kernel
-tools.test generic words parser ;
+tools.test generic words parser eval ;
 
 TUPLE: r/w-test foo ;
 

diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index 5ed0b0a34c1287723525ff1cc69d364562424d94..b945126be4a229ff999ecc496af267d79bcd1fc6 100755 (executable)
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -3,7 +3,7 @@ IN: vocabs.loader.tests
 USING: vocabs.loader tools.test continuations vocabs math
 kernel arrays sequences namespaces io.streams.string
 parser source-files words assocs classes.tuple definitions
-debugger compiler.units tools.vocabs accessors ;
+debugger compiler.units tools.vocabs accessors eval ;
 
 ! This vocab should not exist, but just in case...
 [ ] [

diff --git a/core/words/words-tests.factor b/core/words/words-tests.factor
index 3f8c492aff7f332a3a8725233320ce04ccedd9c8..09ebcb6b777668dd2c5a7c40ef4884aaedc00093 100755 (executable)
--- a/core/words/words-tests.factor
+++ b/core/words/words-tests.factor
@@ -1,7 +1,7 @@
 USING: arrays generic assocs kernel math namespaces
 sequences tools.test words definitions parser quotations
 vocabs continuations classes.tuple compiler.units
-io.streams.string accessors ;
+io.streams.string accessors eval ;
 IN: words.tests
 
 [ 4 ] [

diff --git a/extra/money/money.factor b/extra/money/money.factor
index ba7a0ae04fc964d353bebae0f718bab1d07e457a..0c654c4819343f14eb8457cddba180c7b7e30332 100644 (file)
--- a/extra/money/money.factor
+++ b/extra/money/money.factor
@@ -1,6 +1,6 @@
 USING: io kernel math math.functions math.parser parser lexer
 namespaces sequences splitting grouping combinators
-continuations sequences.lib ;
+continuations sequences.lib eval ;
 IN: money
 
 : dollars/cents ( dollars -- dollars cents )

diff --git a/extra/peg/ebnf/ebnf-tests.factor b/extra/peg/ebnf/ebnf-tests.factor
index 45e1e9b2187490ae3b11f9e8b9fc696c9cd14bb8..47f19920c74acabdbf020213f925bde2f0395ada 100644 (file)
--- a/extra/peg/ebnf/ebnf-tests.factor
+++ b/extra/peg/ebnf/ebnf-tests.factor
@@ -3,7 +3,7 @@
 !
 USING: kernel tools.test peg peg.ebnf words math math.parser 
        sequences accessors peg.parsers parser namespaces arrays 
-       strings ;
+       strings eval ;
 IN: peg.ebnf.tests
 
 { T{ ebnf-non-terminal f "abc" } } [