Updating code to use require-when rather than vocab [ require ] when

basis/bootstrap/compiler/compiler.factor

@@ -20,11 +20,11 @@ IN: bootstrap.compiler
     "alien.remote-control" require
 ] unless
 
-"prettyprint" vocab [
+{
-    "stack-checker.errors.prettyprint" require
+    "stack-checker.errors.prettyprint"
-    "alien.prettyprint" require
+    "alien.prettyprint"
-    "alien.debugger" require
+    "alien.debugger"
-] when
+} [ "prettyprint" swap require-when ] each
 
 "cpu." cpu name>> append require
 

basis/bootstrap/threads/threads.factor

@@ -1,11 +1,9 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: vocabs vocabs.loader kernel io.thread threads
+USING: vocabs.loader kernel io.thread threads
 compiler.utilities namespaces ;
 IN: bootstrap.threads
 
-"debugger" vocab [
+"debugger" "debugger.threads" require-when
-    "debugger.threads" require
-] when
 
 [ yield ] yield-hook set-global

basis/classes/struct/struct.factor

@@ -404,4 +404,4 @@ FUNCTOR-SYNTAX: STRUCT:
 
 USING: vocabs vocabs.loader ;
 
-"prettyprint" vocab [ "classes.struct.prettyprint" require ] when
+"prettyprint" "classes.struct.prettyprint" require-when

basis/http/client/client.factor

@@ -196,4 +196,4 @@ ERROR: download-failed response ;
 
 USING: vocabs vocabs.loader ;
 
-"debugger" vocab [ "http.client.debugger" require ] when
+"debugger" "http.client.debugger" require-when

basis/locals/locals.factor

@@ -26,7 +26,5 @@ SYNTAX: MEMO:: (::) define-memoized ;
     "locals.fry"
 } [ require ] each
 
-"prettyprint" vocab [
+"prettyprint" "locals.definitions" require-when
-    "locals.definitions" require
+"prettyprint" "locals.prettyprint" require-when
-    "locals.prettyprint" require
-] when

basis/math/rectangles/rectangles.factor

@@ -62,6 +62,6 @@ M: rect contains-point?
     [ [ dim>> ] dip (>>dim) ]
     2bi ; inline
 
-USING: vocabs vocabs.loader ;
+USE: vocabs.loader
 
-"prettyprint" vocab [ "math.rectangles.prettyprint" require ] when
+"prettyprint" "math.rectangles.prettyprint" require-when

basis/peg/peg.factor

@@ -630,6 +630,4 @@ SYNTAX: PEG:
 
 USING: vocabs vocabs.loader ;
 
-"debugger" vocab [
+"debugger" "peg.debugger" require-when
-    "peg.debugger" require
-] when

basis/regexp/regexp.factor

@@ -218,6 +218,4 @@ SYNTAX: R| CHAR: | parsing-regexp ;
 
 USING: vocabs vocabs.loader ;
 
-"prettyprint" vocab [
+"prettyprint" "regexp.prettyprint" require-when
-    "regexp.prettyprint" require
-] when

basis/specialized-arrays/specialized-arrays.factor

@@ -173,10 +173,6 @@ SYNTAX: SPECIALIZED-ARRAYS:
 SYNTAX: SPECIALIZED-ARRAY:
     scan-c-type define-array-vocab use-vocab ;
 
-"prettyprint" vocab [
+"prettyprint" "specialized-arrays.prettyprint" require-when
-    "specialized-arrays.prettyprint" require
-] when
 
-"mirrors" vocab [
+"mirrors" "specialized-arrays.mirrors" require-when
-    "specialized-arrays.mirrors" require
-] when

basis/typed/typed.factor

@@ -166,4 +166,4 @@ SYNTAX: TYPED::
 
 USING: vocabs vocabs.loader ;
 
-"prettyprint" vocab [ "typed.prettyprint" require ] when
+"prettyprint" "typed.prettyprint" require-when

basis/ui/gadgets/gadgets.factor

@@ -393,6 +393,6 @@ M: f request-focus-on 2drop ;
 : focus-path ( gadget -- seq )
     [ focus>> ] follow ;
 
-USING: vocabs vocabs.loader ;
+USE: vocabs.loader
 
-"prettyprint" vocab [ "ui.gadgets.prettyprint" require ] when
+"prettyprint" "ui.gadgets.prettyprint" require-when

basis/unix/unix.factor

@@ -74,8 +74,6 @@ M: unix open-file [ open ] unix-system-call ;
 
 <<
 
-"debugger" vocab [
+"debugger" "unix.debugger" require-when
-    "unix.debugger" require
-] when
 
 >>

basis/urls/urls.factor

@@ -183,8 +183,6 @@ PRIVATE>
 ! Literal syntax
 SYNTAX: URL" lexer get skip-blank parse-string >url suffix! ;
 
-USING: vocabs vocabs.loader ;
+USE: vocabs.loader
 
-"prettyprint" vocab [
+"prettyprint" "urls.prettyprint" require-when
-    "urls.prettyprint" require
-] when

basis/windows/com/syntax/syntax.factor

@@ -94,8 +94,6 @@ SYNTAX: COM-INTERFACE:
 
 SYNTAX: GUID: scan string>guid suffix! ;
 
-USING: vocabs vocabs.loader ;
+USE: vocabs.loader
 
-"prettyprint" vocab [
+"prettyprint" "windows.com.prettyprint" require-when
-    "windows.com.prettyprint" require
-] when

extra/game/loop/loop.factor

@@ -114,4 +114,4 @@ M: game-loop dispose
 
 USING: vocabs vocabs.loader ;
 
-"prettyprint" vocab [ "game.loop.prettyprint" require ] when
+"prettyprint" "game.loop.prettyprint" require-when

extra/gpu/shaders/shaders.factor

@@ -575,4 +575,4 @@ M: program-instance dispose
     [ world>> ] [ program>> instances>> ] [ ] tri ?delete-at
     reset-memos ;
 
-"prettyprint" vocab [ "gpu.shaders.prettyprint" require ] when
+"prettyprint" "gpu.shaders.prettyprint" require-when