From 94db86a6dba7a794cc816b0c5d3f24a4333ab815 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 2 Nov 2011 11:23:41 -0700 Subject: [PATCH] Make "foo.private" require load foo instead. Move require from vocabs.loader to vocabs. Update everything. Fixes #201. --- basis/alien/libraries/libraries.factor | 2 +- basis/atk/ffi/ffi.factor | 2 +- basis/bootstrap/compiler/compiler.factor | 6 ++-- basis/bootstrap/help/help.factor | 4 +-- basis/bootstrap/threads/threads.factor | 2 +- basis/bootstrap/tools/tools.factor | 2 +- basis/bootstrap/ui/tools/tools.factor | 2 +- basis/bootstrap/ui/ui.factor | 2 +- basis/calendar/calendar.factor | 2 +- basis/classes/struct/struct.factor | 4 +-- basis/command-line/command-line-docs.factor | 3 +- basis/cpu/ppc/ppc.factor | 2 +- basis/cpu/x86/64/64.factor | 2 +- basis/cpu/x86/x86.factor | 2 +- basis/editors/emacs/emacs.factor | 2 +- basis/editors/gvim/gvim.factor | 2 +- basis/environment/environment.factor | 2 +- basis/environment/unix/unix.factor | 2 +- basis/furnace/furnace.factor | 2 +- basis/furnace/json/json-docs.factor | 3 +- basis/game/input/input.factor | 2 +- basis/gdk/ffi/ffi.factor | 2 +- basis/gdk/gl/ffi/ffi.factor | 2 +- basis/gdk/pixbuf/ffi/ffi.factor | 2 +- basis/gio/ffi/ffi.factor | 2 +- basis/gmodule/ffi/ffi.factor | 2 +- basis/gobject/ffi/ffi.factor | 2 +- basis/gtk/ffi/ffi.factor | 2 +- basis/gtk/gl/ffi/ffi.factor | 2 +- basis/http/server/server.factor | 3 +- basis/io/backend/windows/windows.factor | 2 +- basis/io/directories/directories.factor | 3 +- basis/io/directories/search/search.factor | 3 +- basis/io/directories/unix/unix.factor | 2 +- basis/io/files/info/info.factor | 2 +- basis/io/files/info/unix/unix.factor | 2 +- basis/io/files/links/links.factor | 2 +- basis/io/files/unique/unique.factor | 2 +- basis/io/launcher/launcher.factor | 2 +- basis/io/mmap/mmap.factor | 2 +- basis/io/monitors/monitors.factor | 2 +- basis/io/pipes/pipes.factor | 2 +- basis/io/sockets/secure/secure.factor | 2 +- basis/io/sockets/sockets.factor | 2 +- basis/io/sockets/unix/unix.factor | 2 +- basis/io/standard-paths/standard-paths.factor | 2 +- basis/json/json.factor | 2 +- basis/listener/listener-docs.factor | 2 +- basis/logging/logging.factor | 2 +- basis/math/floats/env/env.factor | 2 +- basis/math/floats/env/x86/x86.factor | 2 +- .../vectors/simd/intrinsics/intrinsics.factor | 2 +- basis/pango/cairo/ffi/ffi.factor | 2 +- basis/pango/ffi/ffi.factor | 2 +- basis/random/random.factor | 2 +- basis/serialize/serialize.factor | 2 +- basis/system-info/system-info.factor | 2 +- basis/tools/deploy/libraries/libraries.factor | 2 +- basis/tools/disassembler/disassembler.factor | 2 +- basis/tools/files/files.factor | 2 +- basis/ui/images/images.factor | 4 +-- basis/ui/text/text.factor | 2 +- basis/unix/ffi/bsd/bsd.factor | 2 +- basis/unix/kqueue/kqueue.factor | 2 +- basis/unix/stat/linux/linux.factor | 2 +- basis/unix/stat/netbsd/netbsd.factor | 2 +- basis/unix/stat/stat.factor | 2 +- basis/unix/statvfs/statvfs.factor | 2 +- basis/unix/types/netbsd/netbsd.factor | 2 +- basis/unix/types/types.factor | 2 +- basis/unix/users/users.factor | 2 +- basis/unix/utmpx/utmpx.factor | 2 +- basis/vocabs/hierarchy/hierarchy-docs.factor | 2 +- core/vocabs/loader/loader.factor | 5 ---- core/vocabs/loader/test/f/f.factor | 2 +- core/vocabs/vocabs.factor | 30 +++++++++++++++++-- extra/audio/loader/loader.factor | 2 +- extra/bson/bson.factor | 2 +- extra/clutter/cally/ffi/ffi.factor | 2 +- extra/clutter/cogl/ffi/ffi.factor | 2 +- extra/clutter/ffi/ffi.factor | 2 +- extra/clutter/gtk/ffi/ffi.factor | 2 +- extra/clutter/json/ffi/ffi.factor | 2 +- extra/crypto/rsa/rsa.factor | 4 +-- extra/dns/dns.factor | 2 +- extra/fuel/fuel.factor | 2 +- extra/gstreamer/base/ffi/ffi.factor | 2 +- extra/gstreamer/controller/ffi/ffi.factor | 2 +- extra/gstreamer/ffi/ffi.factor | 2 +- extra/gstreamer/net/ffi/ffi.factor | 2 +- extra/io/files/trash/trash.factor | 2 +- extra/io/serial/serial.factor | 2 +- extra/io/serial/unix/termios/termios.factor | 2 +- extra/io/serial/unix/unix.factor | 2 +- extra/mongodb/mongodb.factor | 2 +- extra/nested-comments/nested-comments.factor | 2 +- extra/openal/alut/alut.factor | 2 +- extra/time/time.factor | 2 +- unmaintained/arm/arm.factor | 2 +- 99 files changed, 135 insertions(+), 111 deletions(-) diff --git a/basis/alien/libraries/libraries.factor b/basis/alien/libraries/libraries.factor index b8466e023a..a046e3b9f5 100755 --- 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 2577a23b3d..8a7be511c6 100644 --- 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 1c493b0730..3d3a922687 100644 --- 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 4d0f1e584c..9004d556f6 100644 --- 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 571f5bac5e..f0b93695dc 100644 --- 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 c76d4f7898..ad7bd8ddc6 100644 --- 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 bae72d774c..2de9be377a 100644 --- 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 fd09d3663f..4197980449 100644 --- 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 0742b429f6..b451cfcf05 100644 --- 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 d3b4f5c962..91081a2c2e 100644 --- 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 8b48d50086..09070d86fb 100644 --- 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 754ecb3bc1..9111dbea92 100644 --- 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 c7ef46aac2..0252996398 100644 --- 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 b631d2d11c..931bc240ac 100644 --- 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 a3598aea23..fca81df502 100644 --- 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 118746b874..878c73dbdd 100644 --- 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 c196cff57a..7431e38cda 100644 --- 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 abfa15b5ed..ba9d54a42d 100644 --- 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 37b2f40e82..2d12676b3a 100644 --- 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 f0102129bc..a11f17909b 100644 --- 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: diff --git a/basis/game/input/input.factor b/basis/game/input/input.factor index cdbaebcf76..edd30b89fa 100644 --- 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 ce5a40f878..8a3f0da6d3 100644 --- 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 d1f93cf62a..507550ff98 100644 --- 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 d37afcdc21..f8a8c7db88 100644 --- 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 6e82dec098..96227b4679 100644 --- 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 912cd3cff0..7b3a2583bf 100644 --- 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 38ff1789c8..919f9daa0f 100644 --- 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 7da6cebd0f..18e5615c70 100644 --- 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 748da7617f..50d3936693 100644 --- 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 4c5b76431c..6b69d36503 100644 --- 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 3423ac1c93..504b278f61 100755 --- 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 c164f01800..564a6e95c9 100644 --- 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 0b69064311..9b78eb8df5 100644 --- 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 fd25364b04..f8b65bb227 100644 --- 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 a314361e9d..3e832e6d0b 100644 --- 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 554c6f006b..ca07418a53 100644 --- 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 38bcc86cc6..8526321a85 100644 --- 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 79dddba4ec..cd403c5a80 100644 --- 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 451a47bcd3..ec715944f4 100755 --- 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 73125d8f7b..ec51de4261 100644 --- 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 bc9638ce4d..ef7b49d580 100644 --- 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 aee69f640e..62499f5d4f 100644 --- 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 6b29f11d5a..c0d0598adb 100644 --- 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 618491a723..96c55889f9 100644 --- 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 8414284b60..4fcb90b9c7 100644 --- 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 3c4db22e5d..e8bb48c0da 100644 --- 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 790e85d610..ba1d8cf80e 100644 --- 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 34c6c74b3a..028f1ba985 100644 --- 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 e3befe8d3c..ae85af8def 100644 --- a/basis/logging/logging.factor +++ b/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 diff --git a/basis/math/floats/env/env.factor b/basis/math/floats/env/env.factor index 04fbc4f26c..301c1bb5ab 100644 --- 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 aad37b73cc..cf7910f6be 100644 --- 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 563e07d840..1defa827da 100644 --- 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 d34df785bd..d9038090d1 100644 --- 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 ef98c0ac70..5c7d99dc5e 100644 --- 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 9b68d0f6dd..e9f4b74c92 100644 --- 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 fa0a72e7e5..3cb37146c1 100644 --- 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 fdeaa50fde..2f941dbda2 100644 --- 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 36fe3037de..d87f820412 100644 --- 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 c8df2f1094..f8364f83aa 100644 --- 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 29d3674b60..5abea4af88 100644 --- 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 << { - { [ 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 fa85b997e1..1c8d5fa753 100644 --- 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 388fd5a692..ac145e04d7 100644 --- 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 17b653418a..c526a8c327 100644 --- 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 f1c931617e..0dad294dbf 100644 --- 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 3b145d8af5..ae865a79c9 100644 --- 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 4442e822f9..d6b19bf2d5 100644 --- 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 e610140397..a609731c28 100644 --- 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 58fd5d400b..2f0ad775c7 100644 --- 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 c25634624f..cabbed946d 100644 --- 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 8704ca4bd9..84b4ead898 100644 --- 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 1d6dfdedec..f9beda27d6 100644 --- 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 09e3808e5a..94072ed2dd 100644 --- 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 -sequences ; +sequences vocabs ; IN: vocabs.hierarchy ARTICLE: "vocabs.hierarchy" "Vocabulary hierarchy tools" diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index 1b2fc0cc54..5e6a3259e5 100644 --- 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 - -: 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 39d45349e4..a68d903a83 100644 --- 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 746b5d5606..7f1200ea70 100644 --- 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 fb2c6a0919..d1cb43aa3c 100644 --- 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 0c217e1c08..e8d246ddaa 100644 --- 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 dc1ebe0b36..6b75f4d7c9 100644 --- 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 d395cc4d94..eebd4ed7bb 100644 --- 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 1499e68b8e..b2d91928b0 100644 --- 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 7371405803..5dc53b7348 100644 --- 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 4d228027b6..23eb8323e5 100644 --- 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 1e21ccce97..5bbcc435c9 100644 --- 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 4e2aa75d93..868ea1cacd 100644 --- 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 1c0dc9c480..7673b96a69 100644 --- 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 3f2f156e9c..07344014f1 100644 --- 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 4f38260190..c83e8251e5 100644 --- 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 cdfd5d4329..3c1cc6bf85 100644 --- 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 21b1d68e33..8d90046768 100644 --- 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 8049adb4fe..579f91ab2b 100644 --- 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 293d0e8ad6..f3fd0d85d1 100644 --- 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 e5ccd37e87..9001287d81 100644 --- 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 6bf7a85e16..f048b13c02 100644 --- 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 c5417cc3ac..81c6594032 100644 --- 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 9c85574c80..93cc1be1b0 100644 --- a/extra/nested-comments/nested-comments.factor +++ b/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' ) diff --git a/extra/openal/alut/alut.factor b/extra/openal/alut/alut.factor index 07b2e4c2b6..1a1cee9ed9 100755 --- 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 61a4d7415e..3f73014f76 100644 --- 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 2bad556f83..641beee6c1 100644 --- 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 ] -- 2.34.1