From aa6158b366531f42a76f74178bd36c6243905ce7 Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sun, 18 Apr 2010 14:29:24 -0500 Subject: [PATCH] Changing require-when usages to the new syntax for require-when --- basis/bootstrap/compiler/compiler.factor | 4 ++-- basis/bootstrap/handbook/handbook.factor | 2 +- basis/bootstrap/threads/threads.factor | 2 +- basis/bootstrap/ui/tools/tools.factor | 2 +- basis/classes/struct/struct.factor | 2 +- basis/http/client/client.factor | 4 ++-- basis/locals/locals.factor | 4 ++-- basis/math/rectangles/rectangles.factor | 2 +- basis/math/vectors/simd/simd.factor | 2 +- basis/peg/peg.factor | 4 ++-- basis/regexp/regexp.factor | 4 ++-- basis/specialized-arrays/specialized-arrays.factor | 4 ++-- basis/stack-checker/errors/errors.factor | 2 +- basis/typed/typed.factor | 4 ++-- basis/ui/gadgets/gadgets.factor | 2 +- basis/unix/unix.factor | 2 +- basis/urls/urls.factor | 2 +- basis/windows/com/syntax/syntax.factor | 2 +- basis/x11/x11.factor | 2 +- basis/xml/syntax/syntax.factor | 2 +- extra/game/loop/loop.factor | 4 ++-- extra/gpu/shaders/shaders.factor | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor index 0237ed99ee..dc278df572 100644 --- a/basis/bootstrap/compiler/compiler.factor +++ b/basis/bootstrap/compiler/compiler.factor @@ -20,8 +20,8 @@ IN: bootstrap.compiler "alien.remote-control" require ] unless -"prettyprint" "alien.prettyprint" require-when -"debugger" "alien.debugger" require-when +{ "boostrap.compiler" "prettyprint" } "alien.prettyprint" require-when +{ "boostrap.compiler" "debugger" } "alien.debugger" require-when "cpu." cpu name>> append require diff --git a/basis/bootstrap/handbook/handbook.factor b/basis/bootstrap/handbook/handbook.factor index 11f7349b79..ef7a456b7b 100644 --- a/basis/bootstrap/handbook/handbook.factor +++ b/basis/bootstrap/handbook/handbook.factor @@ -1,4 +1,4 @@ USING: vocabs.loader vocabs kernel ; IN: bootstrap.handbook -"bootstrap.help" "help.handbook" require-when +{ "boostrap.handbook" "bootstrap.help" } "help.handbook" require-when diff --git a/basis/bootstrap/threads/threads.factor b/basis/bootstrap/threads/threads.factor index 3a8fe98cf4..2bc8d612b6 100644 --- a/basis/bootstrap/threads/threads.factor +++ b/basis/bootstrap/threads/threads.factor @@ -4,6 +4,6 @@ USING: vocabs.loader kernel io.thread threads compiler.utilities namespaces ; IN: bootstrap.threads -"debugger" "debugger.threads" require-when +{ "bootstrap.threads" "debugger" } "debugger.threads" require-when [ yield ] yield-hook set-global diff --git a/basis/bootstrap/ui/tools/tools.factor b/basis/bootstrap/ui/tools/tools.factor index 7db69ce9c1..3efd156983 100644 --- a/basis/bootstrap/ui/tools/tools.factor +++ b/basis/bootstrap/ui/tools/tools.factor @@ -4,7 +4,7 @@ USING: kernel vocabs vocabs.loader sequences system ; [ "bootstrap." prepend vocab ] all? [ "ui.tools" require - "ui.backend.cocoa" "ui.backend.cocoa.tools" require-when + { "ui.backend.cocoa" } "ui.backend.cocoa.tools" require-when "ui.tools.walker" require ] when diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor index ffde233748..605ee573f5 100644 --- a/basis/classes/struct/struct.factor +++ b/basis/classes/struct/struct.factor @@ -404,4 +404,4 @@ FUNCTOR-SYNTAX: STRUCT: USING: vocabs vocabs.loader ; -"prettyprint" "classes.struct.prettyprint" require-when +{ "classes.struct" "prettyprint" } "classes.struct.prettyprint" require-when diff --git a/basis/http/client/client.factor b/basis/http/client/client.factor index 1221ee39f3..aa2fc8962b 100644 --- a/basis/http/client/client.factor +++ b/basis/http/client/client.factor @@ -194,6 +194,6 @@ ERROR: download-failed response ; : http-delete ( url -- response data ) http-request ; -USING: vocabs vocabs.loader ; +USE: vocabs.loader -"debugger" "http.client.debugger" require-when +{ "http.client" "debugger" } "http.client.debugger" require-when diff --git a/basis/locals/locals.factor b/basis/locals/locals.factor index 7d67881c47..5fd12e2fb3 100644 --- a/basis/locals/locals.factor +++ b/basis/locals/locals.factor @@ -26,5 +26,5 @@ SYNTAX: MEMO:: (::) define-memoized ; "locals.fry" } [ require ] each -"prettyprint" "locals.definitions" require-when -"prettyprint" "locals.prettyprint" require-when +{ "locals" "prettyprint" } "locals.definitions" require-when +{ "locals" "prettyprint" } "locals.prettyprint" require-when diff --git a/basis/math/rectangles/rectangles.factor b/basis/math/rectangles/rectangles.factor index 78ac5457bc..15f4d5376d 100644 --- a/basis/math/rectangles/rectangles.factor +++ b/basis/math/rectangles/rectangles.factor @@ -64,4 +64,4 @@ M: rect contains-point? USE: vocabs.loader -"prettyprint" "math.rectangles.prettyprint" require-when +{ "math.rectangles" "prettyprint" } "math.rectangles.prettyprint" require-when diff --git a/basis/math/vectors/simd/simd.factor b/basis/math/vectors/simd/simd.factor index 65d6e113bf..c845a4df63 100644 --- a/basis/math/vectors/simd/simd.factor +++ b/basis/math/vectors/simd/simd.factor @@ -339,4 +339,4 @@ M: short-8 v*hs+ M: int-4 v*hs+ int-4-rep [ (simd-v*hs+) ] [ call-next-method ] vv->v-op longlong-2-cast ; inline -"mirrors" "math.vectors.simd.mirrors" require-when +{ "math.vectors.simd" "mirrors" } "math.vectors.simd.mirrors" require-when diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor index ca7d28bb97..e50c1d8d95 100644 --- a/basis/peg/peg.factor +++ b/basis/peg/peg.factor @@ -628,6 +628,6 @@ SYNTAX: PEG: ] append! ] ; -USING: vocabs vocabs.loader ; +USE: vocabs.loader -"debugger" "peg.debugger" require-when +{ "debugger" "peg" } "peg.debugger" require-when diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor index eea0a26ea5..bbfe440967 100644 --- a/basis/regexp/regexp.factor +++ b/basis/regexp/regexp.factor @@ -216,6 +216,6 @@ SYNTAX: R` CHAR: ` parsing-regexp ; SYNTAX: R{ CHAR: } parsing-regexp ; SYNTAX: R| CHAR: | parsing-regexp ; -USING: vocabs vocabs.loader ; +USE: vocabs.loader -"prettyprint" "regexp.prettyprint" require-when +{ "prettyprint" "regexp" } "regexp.prettyprint" require-when diff --git a/basis/specialized-arrays/specialized-arrays.factor b/basis/specialized-arrays/specialized-arrays.factor index c82ebd78c8..38f97303ba 100644 --- a/basis/specialized-arrays/specialized-arrays.factor +++ b/basis/specialized-arrays/specialized-arrays.factor @@ -173,6 +173,6 @@ SYNTAX: SPECIALIZED-ARRAYS: SYNTAX: SPECIALIZED-ARRAY: scan-c-type define-array-vocab use-vocab ; -"prettyprint" "specialized-arrays.prettyprint" require-when +{ "specialized-arrays" "prettyprint" } "specialized-arrays.prettyprint" require-when -"mirrors" "specialized-arrays.mirrors" require-when +{ "specialized-arrays" "mirrors" } "specialized-arrays.mirrors" require-when diff --git a/basis/stack-checker/errors/errors.factor b/basis/stack-checker/errors/errors.factor index 5eca37ffbe..f3aeb7bb64 100644 --- a/basis/stack-checker/errors/errors.factor +++ b/basis/stack-checker/errors/errors.factor @@ -35,4 +35,4 @@ ERROR: bad-declaration-error < inference-error declaration ; ERROR: unbalanced-branches-error < inference-error word quots declareds actuals ; -"debugger" "stack-checker.errors.prettyprint" require-when +{ "stack-checker.errors" "debugger" } "stack-checker.errors.prettyprint" require-when diff --git a/basis/typed/typed.factor b/basis/typed/typed.factor index df46303b79..65b21fcc38 100644 --- a/basis/typed/typed.factor +++ b/basis/typed/typed.factor @@ -164,6 +164,6 @@ SYNTAX: TYPED: SYNTAX: TYPED:: (::) define-typed ; -USING: vocabs vocabs.loader ; +USE: vocabs.loader -"prettyprint" "typed.prettyprint" require-when +{ "typed" "prettyprint" } "typed.prettyprint" require-when diff --git a/basis/ui/gadgets/gadgets.factor b/basis/ui/gadgets/gadgets.factor index dca340cd3b..3c1ece1f5e 100644 --- a/basis/ui/gadgets/gadgets.factor +++ b/basis/ui/gadgets/gadgets.factor @@ -395,4 +395,4 @@ M: f request-focus-on 2drop ; USE: vocabs.loader -"prettyprint" "ui.gadgets.prettyprint" require-when +{ "ui.gadgets" "prettyprint" } "ui.gadgets.prettyprint" require-when diff --git a/basis/unix/unix.factor b/basis/unix/unix.factor index dbbfbcce6e..d860bf490e 100644 --- a/basis/unix/unix.factor +++ b/basis/unix/unix.factor @@ -72,6 +72,6 @@ M: unix open-file [ open ] unix-system-call ; << -"debugger" "unix.debugger" require-when +{ "unix" "debugger" } "unix.debugger" require-when >> diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor index cd470a451a..0f89ba0d9f 100644 --- a/basis/urls/urls.factor +++ b/basis/urls/urls.factor @@ -185,4 +185,4 @@ SYNTAX: URL" lexer get skip-blank parse-string >url suffix! ; USE: vocabs.loader -"prettyprint" "urls.prettyprint" require-when +{ "urls" "prettyprint" } "urls.prettyprint" require-when diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor index 9d74ac49f8..dc6a0604fb 100644 --- a/basis/windows/com/syntax/syntax.factor +++ b/basis/windows/com/syntax/syntax.factor @@ -96,4 +96,4 @@ SYNTAX: GUID: scan string>guid suffix! ; USE: vocabs.loader -"prettyprint" "windows.com.prettyprint" require-when +{ "windows.com" "prettyprint" } "windows.com.prettyprint" require-when diff --git a/basis/x11/x11.factor b/basis/x11/x11.factor index e91c6a6909..67c94c88ea 100644 --- a/basis/x11/x11.factor +++ b/basis/x11/x11.factor @@ -33,4 +33,4 @@ SYMBOL: root : with-x ( display-string quot -- ) [ init-x ] dip [ close-x ] [ ] cleanup ; inline -"io.backend.unix" "x11.io.unix" require-when +{ "x11" "io.backend.unix" } "x11.io.unix" require-when diff --git a/basis/xml/syntax/syntax.factor b/basis/xml/syntax/syntax.factor index a58526faa3..e7e8714b29 100644 --- a/basis/xml/syntax/syntax.factor +++ b/basis/xml/syntax/syntax.factor @@ -177,4 +177,4 @@ SYNTAX: [XML USE: vocabs.loader -"inverse" "xml.syntax.inverse" require-when +{ "xml.syntax" "inverse" } "xml.syntax.inverse" require-when diff --git a/extra/game/loop/loop.factor b/extra/game/loop/loop.factor index ffe5acd879..312d7dbd1c 100644 --- a/extra/game/loop/loop.factor +++ b/extra/game/loop/loop.factor @@ -112,6 +112,6 @@ PRIVATE> M: game-loop dispose stop-loop ; -USING: vocabs vocabs.loader ; +USE: vocabs.loader -"prettyprint" "game.loop.prettyprint" require-when +{ "game.loop" "prettyprint" } "game.loop.prettyprint" require-when diff --git a/extra/gpu/shaders/shaders.factor b/extra/gpu/shaders/shaders.factor index 974f2f8070..8a2931e431 100755 --- a/extra/gpu/shaders/shaders.factor +++ b/extra/gpu/shaders/shaders.factor @@ -632,4 +632,4 @@ M: program-instance dispose [ world>> ] [ program>> instances>> ] [ ] tri ?delete-at reset-memos ; -"prettyprint" "gpu.shaders.prettyprint" require-when +{ "gpu.shaders" "prettyprint" } "gpu.shaders.prettyprint" require-when -- 2.34.1