From 4af88ff9ffb449cad5017f9e4a30148c54a9f7d8 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-122.local>
Date: Thu, 18 Mar 2010 01:39:30 -0400
Subject: [PATCH] Making more vocabs use require-when

---
 basis/bootstrap/handbook/handbook.factor | 2 +-
 basis/bootstrap/ui/tools/tools.factor    | 4 +---
 basis/math/vectors/simd/simd.factor      | 4 +---
 basis/mirrors/mirrors.factor             | 4 ----
 basis/x11/x11.factor                     | 2 +-
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/basis/bootstrap/handbook/handbook.factor b/basis/bootstrap/handbook/handbook.factor
index 51aa9eefaf..11f7349b79 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" vocab [ "help.handbook" require ] when
+"bootstrap.help" "help.handbook" require-when
diff --git a/basis/bootstrap/ui/tools/tools.factor b/basis/bootstrap/ui/tools/tools.factor
index 5cf05aef91..7db69ce9c1 100644
--- a/basis/bootstrap/ui/tools/tools.factor
+++ b/basis/bootstrap/ui/tools/tools.factor
@@ -4,9 +4,7 @@ USING: kernel vocabs vocabs.loader sequences system ;
 [ "bootstrap." prepend vocab ] all? [
     "ui.tools" require
 
-    "ui.backend.cocoa" vocab [
-        "ui.backend.cocoa.tools" require
-    ] when
+    "ui.backend.cocoa" "ui.backend.cocoa.tools" require-when
 
     "ui.tools.walker" require
 ] when
diff --git a/basis/math/vectors/simd/simd.factor b/basis/math/vectors/simd/simd.factor
index 8d804247d3..65d6e113bf 100644
--- a/basis/math/vectors/simd/simd.factor
+++ b/basis/math/vectors/simd/simd.factor
@@ -339,6 +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" vocab [
-    "math.vectors.simd.mirrors" require
-] when
+"mirrors" "math.vectors.simd.mirrors" require-when
diff --git a/basis/mirrors/mirrors.factor b/basis/mirrors/mirrors.factor
index 65978f0b46..f12d34e170 100644
--- a/basis/mirrors/mirrors.factor
+++ b/basis/mirrors/mirrors.factor
@@ -59,7 +59,3 @@ M: hashtable make-mirror ;
 M: integer make-mirror drop f ;
 M: enumerated-sequence make-mirror <enum> ;
 M: object make-mirror <mirror> ;
-
-"specialized-arrays" vocab [
-    "specialized-arrays.mirrors" require
-] when
diff --git a/basis/x11/x11.factor b/basis/x11/x11.factor
index 09328c6f6e..e91c6a6909 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" vocab [ "x11.io.unix" require ] when
\ No newline at end of file
+"io.backend.unix" "x11.io.unix" require-when