Make "foo.private" require load foo instead.

Move require from vocabs.loader to vocabs. Update everything.
Fixes #201.

diff --git a/basis/alien/libraries/libraries.factor b/basis/alien/libraries/libraries.factor
index b8466e023a8ceae6451f56790c5a8fd29a608d30..a046e3b9f5fd193290f5a0f685d6c0e98e052a48 100755 (executable)
--- a/basis/alien/libraries/libraries.factor
+++ b/basis/alien/libraries/libraries.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.strings assocs io.backend
 kernel namespaces destructors sequences strings
-system io.pathnames fry combinators vocabs.loader ;
+system io.pathnames fry combinators vocabs ;
 IN: alien.libraries
 
 : dlopen ( path -- dll ) native-string>alien (dlopen) ;

diff --git a/basis/atk/ffi/ffi.factor b/basis/atk/ffi/ffi.factor
index 2577a23b3dbf2a01e1421f87e712f7515d0f2ce6..8a7be511c6b88dc038fd375fb4a08af573c11133 100644 (file)
--- a/basis/atk/ffi/ffi.factor
+++ b/basis/atk/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: atk.ffi
 
 <<

diff --git a/basis/bootstrap/compiler/compiler.factor b/basis/bootstrap/compiler/compiler.factor
index 1c493b0730bda80817d69818a60633ee2d8d420f..3d3a922687c93cdd9d9548d35ec8720738712ed3 100644 (file)
--- a/basis/bootstrap/compiler/compiler.factor
+++ b/basis/bootstrap/compiler/compiler.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2007, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors cpu.architecture vocabs.loader system
+USING: accessors cpu.architecture vocabs system
 sequences namespaces parser kernel kernel.private classes
 classes.private arrays hashtables vectors classes.tuple sbufs
 hashtables.private sequences.private math classes.tuple.private
-growable namespaces.private assocs words command-line vocabs io
+growable namespaces.private assocs words command-line io
 io.encodings.string libc splitting math.parser memory compiler.units
-math.order quotations quotations.private assocs.private ;
+math.order quotations quotations.private assocs.private vocabs.loader ;
 FROM: compiler => enable-optimizer ;
 IN: bootstrap.compiler
 

diff --git a/basis/bootstrap/help/help.factor b/basis/bootstrap/help/help.factor
index 4d0f1e584c174071ce53334b51260acded48aee1..9004d556f69d0849e2708f1618da3f85212b528f 100644 (file)
--- a/basis/bootstrap/help/help.factor
+++ b/basis/bootstrap/help/help.factor
@@ -1,6 +1,6 @@
 USING: help help.topics help.syntax help.crossref
-help.definitions io io.files kernel namespaces vocabs sequences
-parser vocabs.loader vocabs.loader.private accessors assocs ;
+help.definitions io io.files kernel namespaces sequences
+parser vocabs vocabs.loader vocabs.loader.private accessors assocs ;
 IN: bootstrap.help
 
 : load-help ( -- )

diff --git a/basis/bootstrap/threads/threads.factor b/basis/bootstrap/threads/threads.factor
index 571f5bac5eac1c9a782f79372b761421142dc57c..f0b93695dcceb1773c06e41b3f931a3b6829040e 100644 (file)
--- a/basis/bootstrap/threads/threads.factor
+++ b/basis/bootstrap/threads/threads.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USE: vocabs.loader
+USE: vocabs
 
 "threads" require
 "io.thread" require

diff --git a/basis/bootstrap/tools/tools.factor b/basis/bootstrap/tools/tools.factor
index c76d4f78981347deacae44a481f4a4ae89d5541b..ad7bd8ddc6a92d343de9b79ff1f8dd16f099fc96 100644 (file)
--- a/basis/bootstrap/tools/tools.factor
+++ b/basis/bootstrap/tools/tools.factor
@@ -1,4 +1,4 @@
-USING: vocabs.loader sequences system combinators ;
+USING: vocabs sequences system combinators ;
 IN: bootstrap.tools
 
 {

diff --git a/basis/bootstrap/ui/tools/tools.factor b/basis/bootstrap/ui/tools/tools.factor
index bae72d774c7b05667a5ad00acc284f9a3878fcb5..2de9be377aaff0d1b7f0ef8acef5242926dc8774 100644 (file)
--- a/basis/bootstrap/ui/tools/tools.factor
+++ b/basis/bootstrap/ui/tools/tools.factor
@@ -1,4 +1,4 @@
-USING: kernel vocabs vocabs.loader sequences system ;
+USING: kernel vocabs sequences system vocabs.loader ;
 
 { "ui" "help" "tools" }
 [ "bootstrap." prepend lookup-vocab ] all? [

diff --git a/basis/bootstrap/ui/ui.factor b/basis/bootstrap/ui/ui.factor
index fd09d3663f49d12a0e915034e8404e898e4b2f2c..4197980449dbe04718724d75bfc89f64e9aa18d3 100644 (file)
--- a/basis/bootstrap/ui/ui.factor
+++ b/basis/bootstrap/ui/ui.factor
@@ -1,5 +1,5 @@
 USING: alien namespaces system combinators kernel sequences
-vocabs vocabs.loader ;
+vocabs ;
 IN: bootstrap.ui
 
 "bootstrap.math" require

diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor
index 0742b429f6abf3934488163636fd37c74c24be5e..b451cfcf05d73b2430676d4e4b8546228043777a 100644 (file)
--- a/basis/calendar/calendar.factor
+++ b/basis/calendar/calendar.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays classes.tuple combinators
 combinators.short-circuit kernel locals math math.functions
-math.order sequences summary system vocabs.loader ;
+math.order sequences summary system vocabs vocabs.loader ;
 IN: calendar
 
 HOOK: gmt-offset os ( -- hours minutes seconds )

diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor
index d3b4f5c962199460d2cf8cf29de5f2b5d40ca498..91081a2c2e462609e67c3ca902bbc6f34c57298b 100644 (file)
--- a/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor
@@ -9,7 +9,7 @@ functors.backend generalizations generic.parser kernel
 kernel.private lexer libc locals macros math math.order parser
 quotations sequences slots slots.private specialized-arrays
 stack-checker.dependencies summary vectors vocabs.parser words
-classes.private generic definitions ;
+classes.private generic definitions vocabs ;
 FROM: delegate.private => group-words slot-group-words ;
 QUALIFIED: math
 IN: classes.struct
@@ -426,6 +426,6 @@ FUNCTOR-SYNTAX: STRUCT:
     [ parse-struct-slots` ] [ ] while
     [ >array define-struct-class ] append! ;
 
-USING: vocabs vocabs.loader ;
+USING: vocabs.loader ;
 
 { "classes.struct" "prettyprint" } "classes.struct.prettyprint" require-when

diff --git a/basis/command-line/command-line-docs.factor b/basis/command-line/command-line-docs.factor
index 8b48d500867d0c7e3356c91914c96e609c6251c3..09070d86fbed155a264ca82c1e3a94241ff599be 100644 (file)
--- a/basis/command-line/command-line-docs.factor
+++ b/basis/command-line/command-line-docs.factor
@@ -1,4 +1,5 @@
-USING: help.markup help.syntax parser vocabs.loader strings ;
+USING: help.markup help.syntax parser vocabs.loader strings
+vocabs ;
 IN: command-line
 
 HELP: run-bootstrap-init

diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor
index 754ecb3bc1ec8b4bd06ba7d856993ed55c3cfc93..9111dbea92465219a531cada4fd85f87676815d0 100644 (file)
--- a/basis/cpu/ppc/ppc.factor
+++ b/basis/cpu/ppc/ppc.factor
@@ -1069,7 +1069,7 @@ M: ppc immediate-arithmetic? ( n -- ? ) -32768 32767 between? ;
 M: ppc immediate-bitwise?    ( n -- ? ) 0 65535 between? ;
 M: ppc immediate-store?      ( n -- ? ) immediate-comparand? ;
 
-USE: vocabs.loader
+USE: vocabs
 {
     { [ os linux? ] [
         {

diff --git a/basis/cpu/x86/64/64.factor b/basis/cpu/x86/64/64.factor
index c7ef46aac2aac9f2c729cbea1921159d69672e92..02529963984230fc7278ef32ab90f4080319172f 100644 (file)
--- a/basis/cpu/x86/64/64.factor
+++ b/basis/cpu/x86/64/64.factor
@@ -143,7 +143,7 @@ M: x86.64 struct-return-on-stack? f ;
 ! x86-64.
 enable-alien-4-intrinsics
 
-USE: vocabs.loader
+USE: vocabs
 
 {
     { [ os unix? ] [ "cpu.x86.64.unix" require ] }

diff --git a/basis/cpu/x86/x86.factor b/basis/cpu/x86/x86.factor
index b631d2d11c047ab7d6a2a42c2caf38aca4a5a211..931bc240ac69dad59e619b5f71b77a6fad5a3389 100644 (file)
--- a/basis/cpu/x86/x86.factor
+++ b/basis/cpu/x86/x86.factor
@@ -6,7 +6,7 @@ cpu.x86.features cpu.x86.features.private cpu.architecture kernel
 kernel.private math memory namespaces make sequences words system
 layouts combinators math.order math.vectors fry locals compiler.constants
 byte-arrays io macros quotations classes.algebra compiler
-compiler.units init vm vocabs.loader
+compiler.units init vm vocabs
 compiler.cfg.registers
 compiler.cfg.instructions
 compiler.cfg.intrinsics

diff --git a/basis/editors/emacs/emacs.factor b/basis/editors/emacs/emacs.factor
index a3598aea23d71a245f2e27611c57122fe9bf93aa..fca81df502085a63207dfbc5d7f449291dd3f715 100644 (file)
--- a/basis/editors/emacs/emacs.factor
+++ b/basis/editors/emacs/emacs.factor
@@ -1,6 +1,6 @@
 USING: definitions io.launcher kernel parser words sequences math
 math.parser namespaces editors make system combinators.short-circuit
-fry threads vocabs.loader ;
+fry threads vocabs ;
 IN: editors.emacs
 
 SINGLETON: emacsclient

diff --git a/basis/editors/gvim/gvim.factor b/basis/editors/gvim/gvim.factor
index 118746b874e5a8df897507f312e6400351cfb725..878c73dbdd51f6cab1087e4996b4fbf3d6dd72a4 100644 (file)
--- a/basis/editors/gvim/gvim.factor
+++ b/basis/editors/gvim/gvim.factor
@@ -1,5 +1,5 @@
 USING: editors.vim io.backend kernel namespaces system
-vocabs.loader editors ;
+vocabs editors ;
 IN: editors.gvim
 
 ! This code builds on the code in editors.vim; see there for

diff --git a/basis/environment/environment.factor b/basis/environment/environment.factor
index c196cff57a9ec7afd6476c61e76980f03ae5321e..7431e38cdad55984de2bae0a18d69f56d4bfe225 100644 (file)
--- a/basis/environment/environment.factor
+++ b/basis/environment/environment.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs combinators kernel sequences splitting system
-vocabs.loader init ;
+vocabs init vocabs.loader ;
 IN: environment
 
 HOOK: os-env os ( key -- value )

diff --git a/basis/environment/unix/unix.factor b/basis/environment/unix/unix.factor
index abfa15b5ed82dc2d61d0a88cfff11e2802a8eb97..ba9d54a42d5a3a130e62fedd9433e3cfd701634f 100644 (file)
--- a/basis/environment/unix/unix.factor
+++ b/basis/environment/unix/unix.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.data alien.strings
 alien.syntax kernel layouts sequences system unix
-environment io.encodings.utf8 unix.utilities vocabs.loader
+environment io.encodings.utf8 unix.utilities vocabs
 combinators alien.accessors unix.ffi ;
 IN: environment.unix
 

diff --git a/basis/furnace/furnace.factor b/basis/furnace/furnace.factor
index 37b2f40e82b5075f16aa2f6c876f1894b791a517..2d12676b3a10683406ac99c4f7d269cee078ea6b 100644 (file)
--- a/basis/furnace/furnace.factor
+++ b/basis/furnace/furnace.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 IN: furnace
 
-USE: vocabs.loader
+USE: vocabs
 "furnace.actions" require
 "furnace.alloy" require
 "furnace.asides" require

diff --git a/basis/furnace/json/json-docs.factor b/basis/furnace/json/json-docs.factor
index f0102129bcae1be7f6e4f28aaad35aa64470cb8a..a11f17909bb271377282bcaf0139147edf959cb0 100644 (file)
--- a/basis/furnace/json/json-docs.factor
+++ b/basis/furnace/json/json-docs.factor
@@ -1,4 +1,5 @@
-USING: kernel http.server help.markup help.syntax http ;
+USING: kernel http.server help.markup help.syntax http
+vocabs.loader ;
 IN: furnace.json
 
 HELP: <json-content>

diff --git a/basis/game/input/input.factor b/basis/game/input/input.factor
index cdbaebcf76e0bb4ed1d7e10484061e3929d9015f..edd30b89faed606e1569d03539936761a26f97df 100644 (file)
--- a/basis/game/input/input.factor
+++ b/basis/game/input/input.factor
@@ -1,5 +1,5 @@
 USING: arrays accessors continuations kernel math system
-sequences namespaces init vocabs vocabs.loader combinators ;
+sequences namespaces init vocabs combinators ;
 FROM: namespaces => change-global ;
 IN: game.input
 

diff --git a/basis/gdk/ffi/ffi.factor b/basis/gdk/ffi/ffi.factor
index ce5a40f878dc8751885667c9be01dad525ea8133..8a3f0da6d3706ae6d9eb857b3ff3a1daf57a93f8 100644 (file)
--- a/basis/gdk/ffi/ffi.factor
+++ b/basis/gdk/ffi/ffi.factor
@@ -3,7 +3,7 @@
 USING: alien alien.c-types alien.destructors alien.libraries
 alien.syntax cairo.ffi classes.struct combinators
 gobject-introspection gobject-introspection.standard-types
-kernel system vocabs.loader ;
+kernel system vocabs vocabs.loader ;
 IN: gdk.ffi
 
 <<

diff --git a/basis/gdk/gl/ffi/ffi.factor b/basis/gdk/gl/ffi/ffi.factor
index d1f93cf62aeda35204719545b597b39b06f5ca18..507550ff9830e774ed3627e2488ba0b92e60fbd8 100644 (file)
--- a/basis/gdk/gl/ffi/ffi.factor
+++ b/basis/gdk/gl/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs vocabs.loader ;
 IN: gdk.gl.ffi
 
 <<

diff --git a/basis/gdk/pixbuf/ffi/ffi.factor b/basis/gdk/pixbuf/ffi/ffi.factor
index d37afcdc21ff6818505f32ec512683fc3bd57517..f8a8c7db883f4fa1a3c9388d869a57aa510686d8 100644 (file)
--- a/basis/gdk/pixbuf/ffi/ffi.factor
+++ b/basis/gdk/pixbuf/ffi/ffi.factor
@@ -3,7 +3,7 @@
 USING: alien alien.data alien.libraries alien.syntax
 combinators gio.ffi glib.ffi gobject-introspection
 gobject-introspection.standard-types kernel libc
-sequences system vocabs.loader ;
+sequences system vocabs ;
 IN: gdk.pixbuf.ffi
 
 <<

diff --git a/basis/gio/ffi/ffi.factor b/basis/gio/ffi/ffi.factor
index 6e82dec098e053a17874b8e0ee2713384fb7eccb..96227b4679aca47b9307ea8f7ce7bd6b62cd5bb0 100644 (file)
--- a/basis/gio/ffi/ffi.factor
+++ b/basis/gio/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: gio.ffi
 
 <<

diff --git a/basis/gmodule/ffi/ffi.factor b/basis/gmodule/ffi/ffi.factor
index 912cd3cff0cbadf6aca72d35c01831620ee55795..7b3a2583bfdb244d8c86f069ad57788187353f60 100644 (file)
--- a/basis/gmodule/ffi/ffi.factor
+++ b/basis/gmodule/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: gmodule.ffi
 
 <<

diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index 38ff1789c87acceffdd2349cd36b32b0ccb0e0fc..919f9daa0faa7fc93fecfbcb72db1deb8a2adc20 100644 (file)
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.destructors alien.libraries alien.syntax kernel
-combinators gobject-introspection literals math system vocabs.loader ;
+combinators gobject-introspection literals math system vocabs ;
 IN: gobject.ffi
 
 ! these two are needed for the definition of GError and others.

diff --git a/basis/gtk/ffi/ffi.factor b/basis/gtk/ffi/ffi.factor
index 7da6cebd0f201c1b12a996e8eb5ef16ce1a0b3c8..18e5615c70c1e48d514e187aaedd6b207f2abdcf 100644 (file)
--- a/basis/gtk/ffi/ffi.factor
+++ b/basis/gtk/ffi/ffi.factor
@@ -3,7 +3,7 @@
 USING: alien alien.c-types alien.destructors alien.libraries
 alien.syntax combinators gobject-introspection
 gobject-introspection.standard-types kernel pango.ffi system
-vocabs.loader ;
+vocabs ;
 IN: gtk.ffi
 
 <<

diff --git a/basis/gtk/gl/ffi/ffi.factor b/basis/gtk/gl/ffi/ffi.factor
index 748da7617f9d716aaf30b57b84a1208a1e70b799..50d39366930edc04da5a8acde20dce9de055e249 100644 (file)
--- a/basis/gtk/gl/ffi/ffi.factor
+++ b/basis/gtk/gl/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: gtk.gl.ffi
 
 <<

diff --git a/basis/http/server/server.factor b/basis/http/server/server.factor
index 4c5b76431c16c06901199b789ff24f64cd4323a4..6b69d36503716d5c5af6f75e9a7796bd7bcd0911 100644 (file)
--- a/basis/http/server/server.factor
+++ b/basis/http/server/server.factor
@@ -29,7 +29,8 @@ html.streams
 html
 mime.types
 math.order
-xml.writer ;
+xml.writer
+vocabs ;
 FROM: mime.multipart => parse-multipart ;
 IN: http.server
 

diff --git a/basis/io/backend/windows/windows.factor b/basis/io/backend/windows/windows.factor
index 3423ac1c939b9dca4db7f308022e66b598777191..504b278f618b47a0ffb1d82aef5cf1620552cdd1 100755 (executable)
--- a/basis/io/backend/windows/windows.factor
+++ b/basis/io/backend/windows/windows.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2004, 2010 Mackenzie Straight, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.backend namespaces system vocabs.loader ;
+USING: io.backend namespaces system vocabs ;
 IN: io.backend.windows
 
 "io.files.windows" require

diff --git a/basis/io/directories/directories.factor b/basis/io/directories/directories.factor
index c164f018009303ba4f7a701c6f3362cbc9045675..564a6e95c9052545130ac3ffe337f14081efb4e1 100644 (file)
--- a/basis/io/directories/directories.factor
+++ b/basis/io/directories/directories.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators destructors io io.backend
 io.encodings.binary io.files io.files.types io.pathnames
-kernel namespaces sequences system vocabs.loader fry ;
+kernel namespaces sequences system vocabs.loader fry
+vocabs ;
 IN: io.directories
 
 : set-current-directory ( path -- )

diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor
index 0b690643111a6c878ed896829a6fda284b53526a..9b78eb8df5ef1ee96f773111fb6b0750cd1a221c 100644 (file)
--- a/basis/io/directories/search/search.factor
+++ b/basis/io/directories/search/search.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs continuations deques dlists fry
 io.backend io.directories io.files.info io.pathnames kernel
-locals math sequences sorting system unicode.case vocabs.loader ;
+locals math sequences sorting system unicode.case vocabs
+vocabs.loader ;
 IN: io.directories.search
 
 : qualified-directory-entries ( path -- seq )

diff --git a/basis/io/directories/unix/unix.factor b/basis/io/directories/unix/unix.factor
index fd25364b042b2af8d61d19551bd08d4dd6529cbb..f8b65bb227e57691784882591f569fbaf6678423 100644 (file)
--- a/basis/io/directories/unix/unix.factor
+++ b/basis/io/directories/unix/unix.factor
@@ -5,7 +5,7 @@ combinators continuations destructors fry io io.backend
 io.directories io.encodings.binary
 io.encodings.utf8 io.files io.pathnames io.files.types kernel
 math.bitwise sequences system unix unix.stat vocabs.loader
-classes.struct unix.ffi literals libc ;
+classes.struct unix.ffi literals libc vocabs ;
 IN: io.directories.unix
 
 CONSTANT: file-mode OCT: 0666

diff --git a/basis/io/files/info/info.factor b/basis/io/files/info/info.factor
index a314361e9d7db4fcd7a67dcff5e3e48e72a0e477..3e832e6d0b549d37f06974a16a6e11fc11058d48 100644 (file)
--- a/basis/io/files/info/info.factor
+++ b/basis/io/files/info/info.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman, Eduardo Cavazos.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel system sequences combinators
-vocabs.loader io.files.types io.directories math ;
+vocabs vocabs.loader io.files.types io.directories math ;
 IN: io.files.info
 
 ! File info

diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor
index 554c6f006b07a1f24faf5f798212125e52fdf491..ca07418a53f361f82eca49ca96953d90c62d4e2e 100644 (file)
--- a/basis/io/files/info/unix/unix.factor
+++ b/basis/io/files/info/unix/unix.factor
@@ -5,7 +5,7 @@ calendar.unix classes.struct combinators
 combinators.short-circuit io.backend io.directories
 io.files.info io.files.types kernel literals math math.bitwise
 sequences specialized-arrays strings system unix unix.ffi
-unix.groups unix.stat unix.time unix.users vocabs.loader ;
+unix.groups unix.stat unix.time unix.users vocabs ;
 IN: io.files.info.unix
 SPECIALIZED-ARRAY: timeval
 

diff --git a/basis/io/files/links/links.factor b/basis/io/files/links/links.factor
index 38bcc86cc6b00fbb8a9cae6a46ddf075d9ea13e2..8526321a854684b35c68cd67458f54ac268c4d75 100644 (file)
--- a/basis/io/files/links/links.factor
+++ b/basis/io/files/links/links.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors io.backend io.files.info io.files.types
-io.pathnames kernel math namespaces system vocabs.loader ;
+io.pathnames kernel math namespaces system vocabs ;
 IN: io.files.links
 
 HOOK: make-link os ( target symlink -- )

diff --git a/basis/io/files/unique/unique.factor b/basis/io/files/unique/unique.factor
index 79dddba4ec36b4bcd3cb134e537edf9c7862cf3e..cd403c5a80ad338a96677b1d9e752f31a773f77e 100644 (file)
--- a/basis/io/files/unique/unique.factor
+++ b/basis/io/files/unique/unique.factor
@@ -3,7 +3,7 @@
 USING: arrays combinators continuations fry io io.backend
 io.directories io.directories.hierarchy io.files io.pathnames
 kernel locals math math.bitwise math.parser namespaces random
-sequences system vocabs.loader random.data ;
+sequences system vocabs random.data ;
 IN: io.files.unique
 
 HOOK: (touch-unique-file) io-backend ( path -- )

diff --git a/basis/io/launcher/launcher.factor b/basis/io/launcher/launcher.factor
index 451a47bcd3c74e821f94ab8895245bd89f1f2ea8..ec715944f49991809b8abe0e2a5088651b827bdd 100755 (executable)
--- a/basis/io/launcher/launcher.factor
+++ b/basis/io/launcher/launcher.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: system kernel namespaces strings hashtables sequences
-assocs combinators vocabs.loader init threads continuations math
+assocs combinators vocabs init threads continuations math
 accessors concurrency.flags destructors environment fry io
 io.encodings.ascii io.backend io.timeouts io.pipes
 io.pipes.private io.encodings io.encodings.utf8

diff --git a/basis/io/mmap/mmap.factor b/basis/io/mmap/mmap.factor
index 73125d8f7bb827aee8d8ae6fb3f27df53b991d93..ec51de42616dba47caaebb7939a003d263199eb4 100644 (file)
--- a/basis/io/mmap/mmap.factor
+++ b/basis/io/mmap/mmap.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations destructors io.files io.files.info
 io.backend kernel quotations system alien alien.accessors
-accessors vocabs.loader combinators alien.c-types alien.data
+accessors vocabs combinators alien.c-types alien.data
 math ;
 IN: io.mmap
 

diff --git a/basis/io/monitors/monitors.factor b/basis/io/monitors/monitors.factor
index bc9638ce4d5d7553470d76896b84090b36b3acbb..ef7b49d580a06073f691ae1aa37148797767351f 100644 (file)
--- a/basis/io/monitors/monitors.factor
+++ b/basis/io/monitors/monitors.factor
@@ -3,7 +3,7 @@
 USING: io.backend kernel continuations destructors namespaces
 sequences assocs hashtables sorting arrays threads boxes
 io.timeouts accessors concurrency.mailboxes fry
-system vocabs.loader combinators ;
+system vocabs combinators ;
 IN: io.monitors
 
 HOOK: init-monitors io-backend ( -- )

diff --git a/basis/io/pipes/pipes.factor b/basis/io/pipes/pipes.factor
index aee69f640e4527e908204d8aa13932b18a14be2b..62499f5d4f759dd2158611afc576887e11ce11ff 100644 (file)
--- a/basis/io/pipes/pipes.factor
+++ b/basis/io/pipes/pipes.factor
@@ -3,7 +3,7 @@
 USING: io.encodings io.backend io.ports io.streams.duplex
 io splitting grouping sequences namespaces kernel
 destructors math concurrency.combinators accessors fry
-arrays continuations quotations system vocabs.loader combinators ;
+arrays continuations quotations system vocabs combinators ;
 IN: io.pipes
 
 TUPLE: pipe in out ;

diff --git a/basis/io/sockets/secure/secure.factor b/basis/io/sockets/secure/secure.factor
index 6b29f11d5a806097df397b4d5e9209d6b6dedb1b..c0d0598adb9d03167b9a953b04b58198dd83df62 100644 (file)
--- a/basis/io/sockets/secure/secure.factor
+++ b/basis/io/sockets/secure/secure.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel namespaces continuations destructors io
 debugger io.sockets io.sockets.private sequences summary
-calendar delegate system vocabs.loader combinators present ;
+calendar delegate system vocabs combinators present ;
 IN: io.sockets.secure
 
 SYMBOL: secure-socket-timeout

diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor
index 618491a72343ea5660d994953ffb657b2d359b31..96c55889f975d840b76a46dbf9b38c10af45bdbc 100644 (file)
--- a/basis/io/sockets/sockets.factor
+++ b/basis/io/sockets/sockets.factor
@@ -8,7 +8,7 @@ grouping init io.backend io.binary io.encodings
 io.encodings.ascii io.encodings.binary io.pathnames io.ports
 io.streams.duplex kernel libc locals math math.parser memoize
 namespaces parser present sequences splitting strings summary
-system values vocabs.loader vocabs.parser
+system values vocabs.loader vocabs.parser vocabs
 sequences.private ;
 IN: io.sockets
 

diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor
index 8414284b6069b6efbc0d18b9e892d78b88f93bbe..4fcb90b9c73f3589274d3581c822887ea4fca752 100644 (file)
--- a/basis/io/sockets/unix/unix.factor
+++ b/basis/io/sockets/unix/unix.factor
@@ -6,7 +6,7 @@ destructors generic init io.backend io.backend.unix io.binary
 io.encodings.utf8 io.files.private io.pathnames
 io.sockets.private io.streams.duplex kernel libc locals math
 math.parser sequences system threads unix unix.ffi
-vocabs.loader ;
+vocabs ;
 EXCLUDE: namespaces => bind ;
 EXCLUDE: io => read write ;
 EXCLUDE: io.sockets => accept ;

diff --git a/basis/io/standard-paths/standard-paths.factor b/basis/io/standard-paths/standard-paths.factor
index 3c4db22e5d615c6e04e562b1a712633abc8401f8..e8bb48c0da5ed2f85ef027f1723d2ae1df798075 100644 (file)
--- a/basis/io/standard-paths/standard-paths.factor
+++ b/basis/io/standard-paths/standard-paths.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2011 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators io.pathnames kernel sequences system
-vocabs.loader ;
+vocabs ;
 IN: io.standard-paths
 
 HOOK: find-native-bundle os ( string -- path )

diff --git a/basis/json/json.factor b/basis/json/json.factor
index 790e85d610c827d57fc83453d5fff0cd5c246ecb..ba1d8cf80eba5c136f43d91f87a1d86d2047abfb 100644 (file)
--- a/basis/json/json.factor
+++ b/basis/json/json.factor
@@ -1,4 +1,4 @@
-USING: kernel vocabs.loader ;
+USING: kernel vocabs ;
 IN: json
 
 SINGLETON: json-null

diff --git a/basis/listener/listener-docs.factor b/basis/listener/listener-docs.factor
index 34c6c74b3a820759f71e242051b6313939057575..028f1ba98522f2b5725789d6a70337c56efa8ebc 100644 (file)
--- a/basis/listener/listener-docs.factor
+++ b/basis/listener/listener-docs.factor
@@ -1,5 +1,5 @@
 USING: help.markup help.syntax kernel io system prettyprint
-continuations quotations vocabs.loader parser ;
+continuations quotations vocabs parser vocabs.loader ;
 IN: listener
 
 ARTICLE: "listener-watch" "Watching variables in the listener"

diff --git a/basis/logging/logging.factor b/basis/logging/logging.factor
index e3befe8d3c9566746660270aeeb68cf5fe1428c7..ae85af8def3c785af60a99ad811ab0869a5bc683 100644 (file)
--- a/basis/logging/logging.factor
+++ b/basis/logging/logging.factor
@@ -142,7 +142,7 @@ SYNTAX: LOG:
     '[ 1array stack>message _ _ log-message ]\r
     ( message -- ) define-declared ;\r
 \r
-USE: vocabs.loader\r
+USE: vocabs\r
 \r
 "logging.parser" require\r
 "logging.analysis" require\r

diff --git a/basis/math/floats/env/env.factor b/basis/math/floats/env/env.factor
index 04fbc4f26cfcffad15435aa3f1b6a8a53f978d7b..301c1bb5ab575c060dee7921d9926fffd5024035 100644 (file)
--- a/basis/math/floats/env/env.factor
+++ b/basis/math/floats/env/env.factor
@@ -2,7 +2,7 @@
 USING: alien.syntax arrays assocs biassocs combinators
 combinators.short-circuit continuations generalizations kernel
 literals locals math math.bitwise sequences sets system
-vocabs.loader ;
+vocabs ;
 IN: math.floats.env
 
 SINGLETONS:

diff --git a/basis/math/floats/env/x86/x86.factor b/basis/math/floats/env/x86/x86.factor
index aad37b73ccb2710e5cac2cbc790855d4ff6cc44e..cf7910f6be79b8da57e96929b9389e4c40555583 100644 (file)
--- a/basis/math/floats/env/x86/x86.factor
+++ b/basis/math/floats/env/x86/x86.factor
@@ -1,7 +1,7 @@
 USING: accessors alien.c-types arrays assocs biassocs
 classes.struct combinators cpu.x86.features kernel literals
 math math.bitwise math.floats.env math.floats.env.private
-system vocabs.loader ;
+system vocabs ;
 IN: math.floats.env.x86
 
 STRUCT: sse-env

diff --git a/basis/math/vectors/simd/intrinsics/intrinsics.factor b/basis/math/vectors/simd/intrinsics/intrinsics.factor
index 563e07d840fdbc0ec59c708cb2a27f70c163d191..1defa827da6613aa8f4580381895cec2f22349c8 100644 (file)
--- a/basis/math/vectors/simd/intrinsics/intrinsics.factor
+++ b/basis/math/vectors/simd/intrinsics/intrinsics.factor
@@ -4,7 +4,7 @@ sequences.cords cpu.architecture fry generalizations grouping
 kernel libc locals macros math math.libm math.order
 math.ranges math.vectors sequences sequences.generalizations
 sequences.private sequences.unrolled sequences.unrolled.private
-specialized-arrays vocabs.loader words effects.parser locals.parser ;
+specialized-arrays vocabs words effects.parser locals.parser ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAYS:
     c:char c:short c:int c:longlong

diff --git a/basis/pango/cairo/ffi/ffi.factor b/basis/pango/cairo/ffi/ffi.factor
index d34df785bd43b10e0e10c2c7c320e5c87c831795..d9038090d1b6168759c74a6398ae1c60d7d9b011 100644 (file)
--- a/basis/pango/cairo/ffi/ffi.factor
+++ b/basis/pango/cairo/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax cairo.ffi combinators
-kernel gobject-introspection system vocabs.loader ;
+kernel gobject-introspection system vocabs ;
 IN: pango.cairo.ffi
 
 <<

diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor
index ef98c0ac70437d12d50e89d22969a2a76f56fdb9..5c7d99dc5e885cbbbe374bee71bbfa0fd4cd9718 100644 (file)
--- a/basis/pango/ffi/ffi.factor
+++ b/basis/pango/ffi/ffi.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
 alien.syntax combinators kernel gobject-introspection
-gobject-introspection.standard-types system vocabs.loader ;
+gobject-introspection.standard-types system vocabs ;
 IN: pango.ffi
 
 <<

diff --git a/basis/random/random.factor b/basis/random/random.factor
index 9b68d0f6ddb08f17c2dc7fb80433658e0b939adf..e9f4b74c9266db213a5277d1880d301c472d7d4e 100644 (file)
--- a/basis/random/random.factor
+++ b/basis/random/random.factor
@@ -4,7 +4,7 @@ USING: accessors alien.c-types alien.data arrays assocs
 byte-arrays byte-vectors combinators fry io.backend io.binary
 kernel locals math math.bitwise math.constants math.functions
 math.order math.ranges namespaces sequences sequences.private
-sets summary system vocabs.loader ;
+sets summary system vocabs ;
 IN: random
 
 SYMBOL: system-random-generator

diff --git a/basis/serialize/serialize.factor b/basis/serialize/serialize.factor
index fa0a72e7e58f732c64867b2ceaf3b689f3c82b13..3cb37146c1657f685a10264fbd704e046f431cd9 100644 (file)
--- a/basis/serialize/serialize.factor
+++ b/basis/serialize/serialize.factor
@@ -12,7 +12,7 @@ vectors byte-arrays quotations hashtables hashtables.identity
 assocs help.syntax help.markup splitting io.streams.byte-array
 io.encodings.string io.encodings.utf8 io.encodings.binary
 combinators accessors locals prettyprint compiler.units
-sequences.private classes.tuple.private vocabs.loader ;
+sequences.private classes.tuple.private vocabs ;
 IN: serialize
 
 GENERIC: (serialize) ( obj -- )

diff --git a/basis/system-info/system-info.factor b/basis/system-info/system-info.factor
index fdeaa50fdeff810c7da90ca6c2b5cdefb9bfeb60..2f941dbda24f83757a97701be37fdf085cea15eb 100644 (file)
--- a/basis/system-info/system-info.factor
+++ b/basis/system-info/system-info.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators io kernel math math.parser system
-vocabs.loader ;
+vocabs ;
 IN: system-info
 
 HOOK: os-version os ( -- version )    

diff --git a/basis/tools/deploy/libraries/libraries.factor b/basis/tools/deploy/libraries/libraries.factor
index 36fe3037defa825199d7aebfe70c096e81dc89c7..d87f820412d9477e215340a2edd3ac613e53f10c 100644 (file)
--- a/basis/tools/deploy/libraries/libraries.factor
+++ b/basis/tools/deploy/libraries/libraries.factor
@@ -1,6 +1,6 @@
 ! (c)2010 Joe Groff bsd license
 USING: alien.libraries io.pathnames io.pathnames.private kernel
-system vocabs.loader ;
+system vocabs ;
 IN: tools.deploy.libraries
 
 HOOK: find-library-file os ( file -- path )

diff --git a/basis/tools/disassembler/disassembler.factor b/basis/tools/disassembler/disassembler.factor
index c8df2f1094d851949ac8d7634dc4c9dce4f84159..f8364f83aa0a1970fe42b9ede97ea0f4f375c704 100644 (file)
--- a/basis/tools/disassembler/disassembler.factor
+++ b/basis/tools/disassembler/disassembler.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.data arrays byte-arrays compiler.units destructors
 io kernel libc math quotations sequences stack-checker system tr
-vocabs.loader words ;
+vocabs words ;
 IN: tools.disassembler
 
 GENERIC: disassemble ( obj -- )

diff --git a/basis/tools/files/files.factor b/basis/tools/files/files.factor
index 29d3674b60a7761d0055c82732f4bb5dde09bd62..5abea4af88c9057a24ea6b893b51ce6aefa84deb 100644 (file)
--- a/basis/tools/files/files.factor
+++ b/basis/tools/files/files.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays calendar combinators fry io io.directories
 io.files.info kernel math math.parser prettyprint sequences system
-vocabs.loader sorting.slots calendar.format ;
+vocabs sorting.slots calendar.format ;
 IN: tools.files
 
 <PRIVATE

diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor
index 4a23f1c5267dda241a8ca7ba6373283728864eb1..6e1d730a9e09840045363dcdbee0cc702b72949e 100644 (file)
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs cache combinators images images.loader
 kernel memoize namespaces opengl opengl.gl opengl.textures system
-ui.gadgets.worlds vocabs.loader ;
+ui.gadgets.worlds vocabs.loader vocabs ;
 IN: ui.images
 
 TUPLE: image-name path ;
@@ -33,7 +33,7 @@ PRIVATE>
 
 <<
 {
-    { [ os macosx? ] [ "images.loader.cocoa"   require ] }
+    { [ os macosx? ] [ "images.loader.cocoa" require ] }
     { [ os windows?  ] [ "images.loader.gdiplus" require ] }
     [ "images.loader.gtk" require ]
 } cond

diff --git a/basis/ui/text/text.factor b/basis/ui/text/text.factor
index fa85b997e15d74e8266e43300193ba74472dbc26..1c8d5fa7530b08699ad918bf82300e54d1aef180 100644 (file)
--- a/basis/ui/text/text.factor
+++ b/basis/ui/text/text.factor
@@ -87,7 +87,7 @@ M: array draw-text
         ] with each
     ] do-matrix ;
 
-USING: vocabs.loader system combinators ;
+USING: vocabs system combinators ;
 
 {
     { [ os macosx? ] [ "core-text" ] }

diff --git a/basis/unix/ffi/bsd/bsd.factor b/basis/unix/ffi/bsd/bsd.factor
index 388fd5a692c624e76dc0610e72ebadb88efc8d15..ac145e04d75b070d385c977753160a1bbd4f4199 100644 (file)
--- a/basis/unix/ffi/bsd/bsd.factor
+++ b/basis/unix/ffi/bsd/bsd.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2006 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.syntax classes.struct combinators
-system unix.types vocabs.loader ;
+system unix.types vocabs ;
 IN: unix.ffi
 
 CONSTANT: MAXPATHLEN 1024

diff --git a/basis/unix/kqueue/kqueue.factor b/basis/unix/kqueue/kqueue.factor
index 17b653418a2fafbe287f689d0e750154bcb9fa5b..c526a8c327f0e1ee733a536d36f73b2661901bd8 100644 (file)
--- a/basis/unix/kqueue/kqueue.factor
+++ b/basis/unix/kqueue/kqueue.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.syntax system sequences vocabs.loader words
-accessors ;
+accessors vocabs ;
 IN: unix.kqueue
 
 << "unix.kqueue." os name>> append require >>

diff --git a/basis/unix/stat/linux/linux.factor b/basis/unix/stat/linux/linux.factor
index f1c931617e8a5afb5ea83418016986781ec966ef..0dad294dbf8cefad4562a14631f5076dec09a4cc 100644 (file)
--- a/basis/unix/stat/linux/linux.factor
+++ b/basis/unix/stat/linux/linux.factor
@@ -1,4 +1,4 @@
-USING: alien.syntax layouts combinators vocabs.loader ;
+USING: alien.syntax layouts combinators vocabs ;
 IN: unix.stat
 
 cell-bits

diff --git a/basis/unix/stat/netbsd/netbsd.factor b/basis/unix/stat/netbsd/netbsd.factor
index 3b145d8af548b4df32bf8f2bf30a8c449bae6c36..ae865a79c9edafe4c27b1fb65f36f6d7da2e1ad0 100644 (file)
--- a/basis/unix/stat/netbsd/netbsd.factor
+++ b/basis/unix/stat/netbsd/netbsd.factor
@@ -1,4 +1,4 @@
-USING: layouts combinators vocabs.loader alien.syntax ;
+USING: layouts combinators vocabs alien.syntax ;
 IN: unix.stat
 
 cell-bits {

diff --git a/basis/unix/stat/stat.factor b/basis/unix/stat/stat.factor
index 4442e822f948f3cc7872667503459e934daf681b..d6b19bf2d58f4423d973a0083a8024cadc5009b1 100644 (file)
--- a/basis/unix/stat/stat.factor
+++ b/basis/unix/stat/stat.factor
@@ -1,5 +1,5 @@
 USING: kernel system combinators alien.syntax alien.c-types
-math vocabs.loader unix classes.struct ;
+math vocabs vocabs.loader unix classes.struct ;
 IN: unix.stat
 
 ! File Types

diff --git a/basis/unix/statvfs/statvfs.factor b/basis/unix/statvfs/statvfs.factor
index e6101403975b7ba477070443ebc266c7c4ad4af3..a609731c289e896d1d50c270e45b7b54c3ef3acc 100644 (file)
--- a/basis/unix/statvfs/statvfs.factor
+++ b/basis/unix/statvfs/statvfs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators system vocabs.loader ;
+USING: combinators system vocabs ;
 IN: unix.statvfs
 
 os {

diff --git a/basis/unix/types/netbsd/netbsd.factor b/basis/unix/types/netbsd/netbsd.factor
index 58fd5d400b21ce13ee2dd9ddcaa4e3e600b44821..2f0ad775c7e0aa33721d27b12dddcc0598fdb222 100644 (file)
--- a/basis/unix/types/netbsd/netbsd.factor
+++ b/basis/unix/types/netbsd/netbsd.factor
@@ -1,4 +1,4 @@
-USING: alien.syntax alien.c-types combinators layouts vocabs.loader ;
+USING: alien.syntax alien.c-types combinators layouts vocabs ;
 IN: unix.types
 
 ! NetBSD 4.0

diff --git a/basis/unix/types/types.factor b/basis/unix/types/types.factor
index c25634624f2605ca094280bd8e914ee2e89e10e0..cabbed946dae4f73f64d574a907a2da4ea9859cb 100644 (file)
--- a/basis/unix/types/types.factor
+++ b/basis/unix/types/types.factor
@@ -1,4 +1,4 @@
-USING: kernel system alien.c-types alien.syntax combinators vocabs.loader ;
+USING: kernel system alien.c-types alien.syntax combinators vocabs ;
 IN: unix.types
 
 TYPEDEF: char int8_t

diff --git a/basis/unix/users/users.factor b/basis/unix/users/users.factor
index 8704ca4bd9a821fd2c1bbd18dd431275a40b24b9..84b4ead898d056adfee8406f48229b9029f0cae4 100644 (file)
--- a/basis/unix/users/users.factor
+++ b/basis/unix/users/users.factor
@@ -4,7 +4,7 @@ USING: accessors alien alien.c-types alien.strings assocs
 byte-arrays classes.struct combinators combinators.short-circuit
 continuations fry grouping io.encodings.utf8 kernel math
 math.parser namespaces sequences splitting strings system unix
-unix.ffi vocabs.loader ;
+unix.ffi vocabs ;
 QUALIFIED: unix.ffi
 IN: unix.users
 

diff --git a/basis/unix/utmpx/utmpx.factor b/basis/unix/utmpx/utmpx.factor
index 1d6dfdedec12ab954fd2e9564e66ac47a47e368b..f9beda27d65837e2ca62933807349f87dadfa292 100644 (file)
--- a/basis/unix/utmpx/utmpx.factor
+++ b/basis/unix/utmpx/utmpx.factor
@@ -3,7 +3,7 @@
 USING: alien.c-types alien.data alien.syntax combinators
 continuations io.encodings.string io.encodings.utf8 kernel
 sequences strings calendar system accessors unix unix.time
-unix.ffi calendar.unix vocabs.loader classes.struct ;
+unix.ffi calendar.unix vocabs classes.struct ;
 IN: unix.utmpx
 
 CONSTANT: EMPTY 0

diff --git a/basis/vocabs/hierarchy/hierarchy-docs.factor b/basis/vocabs/hierarchy/hierarchy-docs.factor
index 09e3808e5a6f433bc26e6ee895a0352f9d4a14c2..94072ed2dd65bd4a00e17fc6b0b120c42dad0daf 100644 (file)
--- a/basis/vocabs/hierarchy/hierarchy-docs.factor
+++ b/basis/vocabs/hierarchy/hierarchy-docs.factor
@@ -1,5 +1,5 @@
 USING: help.markup help.syntax strings vocabs.loader\r
-sequences ;\r
+sequences vocabs ;\r
 IN: vocabs.hierarchy\r
 \r
 ARTICLE: "vocabs.hierarchy" "Vocabulary hierarchy tools"\r

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 1b2fc0cc5415af744aaca6ac837431d0d92a916b..5e6a3259e54d0a4a74a6969f119e15891d505a43 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -70,8 +70,6 @@ SYMBOL: check-vocab-hook
 
 check-vocab-hook [ [ drop ] ] initialize
 
-DEFER: require
-
 <PRIVATE
 
 SYMBOL: require-when-vocabs
@@ -110,9 +108,6 @@ require-when-table [ V{ } clone ] initialize
 
 PRIVATE>
 
-: require ( vocab -- )
-    load-vocab drop ;
-
 : require-when ( if then -- )
     over [ lookup-vocab ] all? [
         require drop

diff --git a/core/vocabs/loader/test/f/f.factor b/core/vocabs/loader/test/f/f.factor
index 39d45349e47e0d7335ad7ac2bdef8334f119fb51..a68d903a836b2cc8d6c7a6513d97180396901110 100644 (file)
--- a/core/vocabs/loader/test/f/f.factor
+++ b/core/vocabs/loader/test/f/f.factor
@@ -1,4 +1,4 @@
 IN: vocabs.laoder.test.f
-USE: vocabs.loader
+USE: vocabs
 
 "vocabs.loader.test.g" require

diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index 746b5d5606d47601dde1d4c8540e3e960ee9b0d6..7f1200ea70c436aea85bfc62eb61dfc710af0220 100644 (file)
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs strings kernel sorting namespaces
-sequences definitions sets combinators ;
+sequences definitions sets combinators splitting ;
 IN: vocabs
 
 SYMBOL: dictionary
@@ -127,9 +127,33 @@ M: vocab-spec forget* forget-vocab ;
 
 SYMBOL: load-vocab-hook ! ( name -- vocab )
 
-: load-vocab ( name -- vocab ) load-vocab-hook get call( name -- vocab ) ;
-
 PREDICATE: runnable-vocab < vocab
     vocab-main >boolean ;
 
 INSTANCE: vocab-spec definition
+
+: call-load-vocab-hook ( name -- )
+    load-vocab-hook get call( name -- vocab ) drop ;
+
+GENERIC: require ( object -- )
+
+M: vocab require name>> require ;
+
+! When calling "foo.private" require, load "foo" instead,
+! but only when "foo.private" does not exist.
+! The reason for this is that stage1 bootstrap starts out with some .private
+! vocabs that contain primitives, and loading the public vocabs would cause
+! circularity issues.
+M: string require ( vocab -- )
+    dup ".private" ?tail [
+        over lookup-vocab [
+            2drop
+        ] [
+            nip call-load-vocab-hook
+        ] if
+    ] [
+        nip call-load-vocab-hook
+    ] if ;
+
+: load-vocab ( name -- vocab )
+    [ require ] [ lookup-vocab ] bi ;

diff --git a/extra/audio/loader/loader.factor b/extra/audio/loader/loader.factor
index fb2c6a0919281f3ceb6ace10c337ffde13d478dc..d1cb43aa3cd0b232e0f9305316a638f3d21edf25 100644 (file)
--- a/extra/audio/loader/loader.factor
+++ b/extra/audio/loader/loader.factor
@@ -1,6 +1,6 @@
 ! (c)2009 Joe Groff bsd license
 USING: ascii assocs io.pathnames kernel namespaces
-vocabs.loader ;
+vocabs ;
 IN: audio.loader
 
 ERROR: unknown-audio-extension extension ;

diff --git a/extra/bson/bson.factor b/extra/bson/bson.factor
index 0c217e1c080ff12f7b1c17154ebdf1a4336217df..e8d246ddaaf2bc3ce82495dba4d970ddc7d4cde4 100644 (file)
--- a/extra/bson/bson.factor
+++ b/extra/bson/bson.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Sascha Matzke.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: vocabs.loader ;
+USING: vocabs ;
 
 IN: bson
 

diff --git a/extra/clutter/cally/ffi/ffi.factor b/extra/clutter/cally/ffi/ffi.factor
index dc1ebe0b36bb07fed3534ad90eac78cd341ae12e..6b75f4d7c93cd3d49f997eefb5262942312f8d14 100644 (file)
--- a/extra/clutter/cally/ffi/ffi.factor
+++ b/extra/clutter/cally/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2011 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: clutter.cally.ffi
 
 <<

diff --git a/extra/clutter/cogl/ffi/ffi.factor b/extra/clutter/cogl/ffi/ffi.factor
index d395cc4d94ef8df05fd18167262aee4e9bfd05d9..eebd4ed7bbd5a88a90f32487451081e4018a0525 100644 (file)
--- a/extra/clutter/cogl/ffi/ffi.factor
+++ b/extra/clutter/cogl/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel opengl.gl system vocabs.loader ;
+gobject-introspection kernel opengl.gl system vocabs ;
 IN: clutter.cogl.ffi
 
 <<

diff --git a/extra/clutter/ffi/ffi.factor b/extra/clutter/ffi/ffi.factor
index 1499e68b8e843ed6fb0628312a4bf742695e2f12..b2d91928b0a15faf82cf37e2f55bce3ba402e01a 100644 (file)
--- a/extra/clutter/ffi/ffi.factor
+++ b/extra/clutter/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax cairo.ffi combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: clutter.ffi
 
 <<

diff --git a/extra/clutter/gtk/ffi/ffi.factor b/extra/clutter/gtk/ffi/ffi.factor
index 73714058039e29ef70bb61f106bdf88d1e7d820b..5dc53b7348b9ac821380f7c57f44ef21914ac0e8 100644 (file)
--- a/extra/clutter/gtk/ffi/ffi.factor
+++ b/extra/clutter/gtk/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: clutter.gtk.ffi
 
 <<

diff --git a/extra/clutter/json/ffi/ffi.factor b/extra/clutter/json/ffi/ffi.factor
index 4d228027b6a939e200cfa86f7a40704048140273..23eb8323e59ef37ec15d3f89f062097e37e47770 100644 (file)
--- a/extra/clutter/json/ffi/ffi.factor
+++ b/extra/clutter/json/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: clutter.json.ffi
 
 <<

diff --git a/extra/crypto/rsa/rsa.factor b/extra/crypto/rsa/rsa.factor
index 1e21ccce9732b5f4d11987e4385a4228f2d21fac..5bbcc435c9223581d4d618cb122e7b6c0f8ccfeb 100644 (file)
--- a/extra/crypto/rsa/rsa.factor
+++ b/extra/crypto/rsa/rsa.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: math.primes kernel math math.functions math.primes
-namespaces sequences accessors ;
+USING: math.primes kernel math math.functions namespaces
+sequences accessors ;
 IN: crypto.rsa
 
 ! The private key is the only secret.

diff --git a/extra/dns/dns.factor b/extra/dns/dns.factor
index 4e2aa75d93207aee712bdd240a0468306a2f9325..868ea1cacd2a84d491b348d8d0d4bbf5e84e66aa 100644 (file)
--- a/extra/dns/dns.factor
+++ b/extra/dns/dns.factor
@@ -6,7 +6,7 @@ io io.binary io.encodings.binary io.encodings.string
 io.encodings.utf8 io.sockets io.sockets.private
 io.streams.byte-array io.timeouts kernel make math math.bitwise
 math.parser namespaces nested-comments random sequences
-slots.syntax splitting system vectors vocabs.loader strings
+slots.syntax splitting system vectors vocabs strings
 ascii ;
 IN: dns
 

diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index 1c0dc9c480d9427890ec9baa7ab743d4806c9d7a..7673b96a697bf490e4c630d90a24668f53cfc0f6 100644 (file)
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -4,7 +4,7 @@
 USING: accessors assocs compiler.units continuations fuel.eval fuel.help
 fuel.remote fuel.xref help.topics io.pathnames kernel namespaces parser
 sequences tools.scaffold vocabs.loader vocabs.parser words vocabs.files
-vocabs.metadata ;
+vocabs.metadata vocabs ;
 
 IN: fuel
 

diff --git a/extra/gstreamer/base/ffi/ffi.factor b/extra/gstreamer/base/ffi/ffi.factor
index 3f2f156e9c0fbeda419215d43bed4357c4c911ba..07344014f19e211a50e12baa886a6566274cd6d4 100644 (file)
--- a/extra/gstreamer/base/ffi/ffi.factor
+++ b/extra/gstreamer/base/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: gstreamer.base.ffi
 
 <<

diff --git a/extra/gstreamer/controller/ffi/ffi.factor b/extra/gstreamer/controller/ffi/ffi.factor
index 4f38260190b6d9f52e6a7cf5f689c6cff32d692b..c83e8251e55764e18f9730a3e242c02625972f26 100644 (file)
--- a/extra/gstreamer/controller/ffi/ffi.factor
+++ b/extra/gstreamer/controller/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: gstreamer.controller.ffi
 
 <<

diff --git a/extra/gstreamer/ffi/ffi.factor b/extra/gstreamer/ffi/ffi.factor
index cdfd5d4329d012204d65dc721ba0011becb33723..3c1cc6bf85d6b5a3f2d1994ae0c3a530d002dfb3 100644 (file)
--- a/extra/gstreamer/ffi/ffi.factor
+++ b/extra/gstreamer/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: gstreamer.ffi
 
 <<

diff --git a/extra/gstreamer/net/ffi/ffi.factor b/extra/gstreamer/net/ffi/ffi.factor
index 21b1d68e339464f0dca41589d267c66efab813d1..8d90046768dd933f33dba7761baf409b8a7adca7 100644 (file)
--- a/extra/gstreamer/net/ffi/ffi.factor
+++ b/extra/gstreamer/net/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators
-gobject-introspection kernel system vocabs.loader ;
+gobject-introspection kernel system vocabs ;
 IN: gstreamer.net.ffi
 
 <<

diff --git a/extra/io/files/trash/trash.factor b/extra/io/files/trash/trash.factor
index 8049adb4fe9a63b906f580b8972e92fb71ea58ca..579f91ab2b94771ddcfda23c9bd6908a780a613c 100644 (file)
--- a/extra/io/files/trash/trash.factor
+++ b/extra/io/files/trash/trash.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: combinators system vocabs.loader ;
+USING: combinators system vocabs ;
 
 IN: io.files.trash
 

diff --git a/extra/io/serial/serial.factor b/extra/io/serial/serial.factor
index 293d0e8ad630c13d30d4188de484d1d19077a574..f3fd0d85d1993a57a880d4fc0d432a60a2fc25c9 100644 (file)
--- a/extra/io/serial/serial.factor
+++ b/extra/io/serial/serial.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types assocs combinators destructors
 kernel math math.bitwise math.parser sequences summary system
-vocabs.loader io ;
+vocabs io ;
 IN: io.serial
 
 TUPLE: serial-port < disposable stream path baud 

diff --git a/extra/io/serial/unix/termios/termios.factor b/extra/io/serial/unix/termios/termios.factor
index e5ccd37e8766bc203913f1435589725064b98ae0..9001287d81e6d7a2456bc999be99d7bab0c9d64e 100644 (file)
--- a/extra/io/serial/unix/termios/termios.factor
+++ b/extra/io/serial/unix/termios/termios.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators system vocabs.loader ;
+USING: combinators system vocabs ;
 IN: io.serial.unix.termios
 
 {

diff --git a/extra/io/serial/unix/unix.factor b/extra/io/serial/unix/unix.factor
index 6bf7a85e1621a7734d2d391c7b3800d246218d91..f048b13c0270696d2c6334424a7ce76b17633d00 100644 (file)
--- a/extra/io/serial/unix/unix.factor
+++ b/extra/io/serial/unix/unix.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.syntax alien.data 
 classes.struct combinators io.ports io.streams.duplex
-system kernel math math.bitwise vocabs.loader io.serial
+system kernel math math.bitwise vocabs io.serial
 io.serial.unix.termios io.backend.unix unix unix.ffi
 literals ;
 IN: io.serial.unix

diff --git a/extra/mongodb/mongodb.factor b/extra/mongodb/mongodb.factor
index c5417cc3ac02445ba744915e4df14f7a2545ba57..81c659403220b7a1cb31a50a7112ae68a21a4c35 100644 (file)
--- a/extra/mongodb/mongodb.factor
+++ b/extra/mongodb/mongodb.factor
@@ -1,4 +1,4 @@
-USING: vocabs.loader ;
+USING: vocabs ;
 
 IN: mongodb
 

diff --git a/extra/nested-comments/nested-comments.factor b/extra/nested-comments/nested-comments.factor
index 9c85574c805fc01caa8da42b58835c038e08353a..93cc1be1b00b36b4081265b93ee196ff3a56cf27 100644 (file)
--- a/extra/nested-comments/nested-comments.factor
+++ b/extra/nested-comments/nested-comments.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 blei, Doug Coleman.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
-USING: kernel sequences math locals make multiline ;\r
+USING: kernel sequences math locals make ;\r
 IN: nested-comments\r
 \r
 : (count-subsequences) ( count substring string n -- count' )\r

diff --git a/extra/openal/alut/alut.factor b/extra/openal/alut/alut.factor
index 07b2e4c2b610bf09585040a4801706354628c269..1a1cee9ed973bcfe88984676f18f5e25d37f4190 100755 (executable)
--- a/extra/openal/alut/alut.factor
+++ b/extra/openal/alut/alut.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel accessors arrays alien system combinators
-alien.syntax namespaces alien.c-types sequences vocabs.loader
+alien.syntax namespaces alien.c-types sequences vocabs
 shuffle openal openal.alut.backend alien.libraries generalizations
 specialized-arrays alien.destructors ;
 FROM: alien.c-types => float short ;

diff --git a/extra/time/time.factor b/extra/time/time.factor
index 61a4d7415e9ad0572eca1440c5da3e5c1cde8100..3f73014f76069ee16d181e009e9396a19188bf87 100644 (file)
--- a/extra/time/time.factor
+++ b/extra/time/time.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators kernel system vocabs.loader ;
+USING: combinators kernel system vocabs ;
 IN: time
 
 HOOK: set-time os ( timestamp -- )

diff --git a/unmaintained/arm/arm.factor b/unmaintained/arm/arm.factor
index 2bad556f83d00068cdcda14780fc191be52e1341..641beee6c1eed99b7265a050859e6de633c8d3a9 100644 (file)
--- a/unmaintained/arm/arm.factor
+++ b/unmaintained/arm/arm.factor
@@ -3,7 +3,7 @@
 USING: alien alien.c-types kernel math namespaces
 cpu.architecture cpu.arm.architecture cpu.arm.assembler
 cpu.arm.intrinsics generator generator.registers continuations
-compiler io vocabs.loader sequences system ;
+compiler io vocabs sequences system ;
 
 ! EABI passes floats in integer registers.
 [ alien-float ]