From 4cb64aaeb8e7cfda8ff0bc9aa3375df926b68285 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 29 Jul 2008 00:05:01 -0500 Subject: [PATCH] Fixing unit tests for eval word being moved --- basis/delegate/delegate-tests.factor | 2 +- basis/help/crossref/crossref-tests.factor | 2 +- basis/help/definitions/definitions-tests.factor | 2 +- basis/help/syntax/syntax-tests.factor | 2 +- basis/help/topics/topics-tests.factor | 2 +- basis/inference/inference-tests.factor | 2 +- basis/libc/libc-tests.factor | 4 ++-- basis/listener/listener-tests.factor | 2 +- basis/macros/macros-tests.factor | 2 +- basis/memoize/memoize-tests.factor | 2 +- basis/mirrors/mirrors-tests.factor | 2 +- basis/prettyprint/prettyprint-tests.factor | 4 ++-- basis/symbols/symbols-tests.factor | 3 ++- basis/tools/annotations/annotations-tests.factor | 2 +- basis/tools/deploy/backend/backend.factor | 1 + basis/tools/deploy/shaker/shaker.factor | 3 +-- core/classes/mixin/mixin-tests.factor | 2 +- core/classes/tuple/parser/parser-tests.factor | 2 +- core/classes/tuple/tuple-tests.factor | 2 +- core/classes/union/union-tests.factor | 3 ++- core/continuations/continuations-tests.factor | 2 +- core/generic/generic-tests.factor | 2 +- core/parser/parser-tests.factor | 2 +- core/slots/slots-tests.factor | 2 +- core/vocabs/loader/loader-tests.factor | 2 +- core/words/words-tests.factor | 2 +- extra/money/money.factor | 2 +- extra/peg/ebnf/ebnf-tests.factor | 2 +- 28 files changed, 32 insertions(+), 30 deletions(-) diff --git a/basis/delegate/delegate-tests.factor b/basis/delegate/delegate-tests.factor index bc173ab0c8..09a90121bd 100755 --- 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 1d569d8a8f..2e8c173944 100755 --- 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 7134c6b0b0..2c894c3812 100755 --- 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 5d8a1a0b78..68306263a5 100755 --- 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 1099f747bc..a343aa1734 100644 --- 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 d66821e230..22a384f235 100755 --- 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 249399bdd0..b00463127f 100755 --- a/basis/libc/libc-tests.factor +++ b/basis/libc/libc-tests.factor @@ -4,8 +4,8 @@ destructors kernel ; 100 malloc "block" set -[ t ] [ "block" get mallocs get key? ] unit-test +[ t ] [ "block" get mallocs key? ] unit-test [ ] [ [ "block" get &free drop ] with-destructors ] unit-test -[ f ] [ "block" get mallocs get key? ] unit-test +[ f ] [ "block" get mallocs key? ] unit-test diff --git a/basis/listener/listener-tests.factor b/basis/listener/listener-tests.factor index 24449049e0..e681bac314 100755 --- 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 91527c2125..150fd9eeaa 100644 --- 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 c2592b38ca..1f819d281d 100644 --- 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 879ec55861..2eda136ae5 100755 --- 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 fd76b87dbb..534ab0fd09 100755 --- 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 1ae4a38cb7..274c4de85b 100755 --- 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 ec8f48a161..2bdcab50cb 100755 --- 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 7559b44832..723f9461a8 100755 --- 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 a3fc08554c..7a4d93c4bd 100755 --- 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 b455676c38..f6ca9184b2 100644 --- 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 6f7d4af6bc..7b0cb998e4 100644 --- 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 35d4149d37..dc83a15e9b 100755 --- 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 4fd8cf643e..97baf08874 100644 --- 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 c292cf7691..28658d67d7 100755 --- 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 f3c51506fb..5927927122 100755 --- 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 074b3738ac..2d4073d107 100755 --- 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 c1d2a5cf9b..4f4a0cadad 100644 --- 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 5ed0b0a34c..b945126be4 100755 --- 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 3f8c492aff..09ebcb6b77 100755 --- 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 ba7a0ae04f..0c654c4819 100644 --- 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 45e1e9b218..47f19920c7 100644 --- 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" } } [