Make "foo.private" require load foo instead.

Move require from vocabs.loader to vocabs. Update everything. Fixes factor#201.
slavapestov · Nov 2, 2011 · 94db86a · 94db86a
1 parent 359c931
commit 94db86a
Show file tree

Hide file tree

Showing 99 changed files with 135 additions and 111 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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