Make "foo.private" require load foo instead.

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

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) ;

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
 
 <<

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
 

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
+help.definitions io io.files kernel namespaces sequences
-parser vocabs.loader vocabs.loader.private accessors assocs ;
+parser vocabs vocabs.loader vocabs.loader.private accessors assocs ;
 IN: bootstrap.help
 
 : load-help ( -- )

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

basis/bootstrap/tools/tools.factor

@@ -1,4 +1,4 @@
-USING: vocabs.loader sequences system combinators ;
+USING: vocabs sequences system combinators ;
 IN: bootstrap.tools
 
 {

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? [

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

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 )

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

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

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? ] [
         {

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 ] }

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

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

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

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 )

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
 

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

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>

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
 

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
 
 <<

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
 
 <<

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
 
 <<

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
 
 <<

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
 
 <<

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.

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
 
 <<

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
 
 <<

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
 

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

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 -- )

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 )

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

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

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
 

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 -- )

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 -- )

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

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
 

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 ( -- )

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 ;

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

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
 

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 ;

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 )

basis/json/json.factor

@@ -1,4 +1,4 @@
-USING: kernel vocabs.loader ;
+USING: kernel vocabs ;
 IN: json
 
 SINGLETON: json-null

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"

basis/logging/logging.factor

@@ -142,7 +142,7 @@ SYNTAX: LOG:
     '[ 1array stack>message _ _ log-message ]
     ( message -- ) define-declared ;
 
-USE: vocabs.loader
+USE: vocabs
 
 "logging.parser" require
 "logging.analysis" require

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:

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

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

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
 
 <<

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
 
 <<

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

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 -- )

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 )    

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 )

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 -- )

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

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 ;

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" ] }

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

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 >>

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

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 {

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

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 {

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

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

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
 

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

basis/vocabs/hierarchy/hierarchy-docs.factor

@@ -1,5 +1,5 @@
 USING: help.markup help.syntax strings vocabs.loader
-sequences ;
+sequences vocabs ;
 IN: vocabs.hierarchy
 
 ARTICLE: "vocabs.hierarchy" "Vocabulary hierarchy tools"

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

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

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 ;

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 ;

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
 

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
 
 <<

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
 
 <<

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
 
 <<

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
 
 <<

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
 
 <<

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
+USING: math.primes kernel math math.functions namespaces
-namespaces sequences accessors ;
+sequences accessors ;
 IN: crypto.rsa
 
 ! The private key is the only secret.

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
 

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
 

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
 
 <<

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
 
 <<

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
 
 <<

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
 
 <<

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
 

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 

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
 
 {

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

extra/mongodb/mongodb.factor

@@ -1,4 +1,4 @@
-USING: vocabs.loader ;
+USING: vocabs ;
 
 IN: mongodb
 

extra/nested-comments/nested-comments.factor

@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 blei, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences math locals make multiline ;
+USING: kernel sequences math locals make ;
 IN: nested-comments
 
 : (count-subsequences) ( count substring string n -- count' )

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 ;

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 -- )

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 ]