core/basis: trim down using lists

diff --git a/basis/bootstrap/stage2.factor b/basis/bootstrap/stage2.factor
index 4886ec124d4e83bcf7c74e6a781662baef64bd1f..15872ce4997f30bf8b1651e953d7e197c1537a12 100644 (file)
--- a/basis/bootstrap/stage2.factor
+++ b/basis/bootstrap/stage2.factor
@@ -1,11 +1,9 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors init namespaces words words.symbol io
-kernel.private math memory continuations kernel io.files
-io.pathnames io.backend system parser vocabs sequences
-vocabs.loader combinators splitting source-files strings
-definitions assocs compiler.units math.parser
-generic sets command-line parser.notes ;
+USING: command-line compiler.units continuations definitions io
+io.pathnames kernel math math.parser memory namespaces parser
+parser.notes sequences sets splitting system
+vocabs vocabs.loader ;
 IN: bootstrap.stage2
 
 SYMBOL: core-bootstrap-time

diff --git a/basis/combinators/short-circuit/short-circuit.factor b/basis/combinators/short-circuit/short-circuit.factor
index 284e2a60d4c96fc0816c990817cd4c50708196da..f775c2f24cb33a636c1908cdc5dfbe09f32de65b 100644 (file)
--- a/basis/combinators/short-circuit/short-circuit.factor
+++ b/basis/combinators/short-circuit/short-circuit.factor
@@ -1,5 +1,5 @@
-USING: kernel combinators quotations arrays sequences assocs
-generalizations macros fry math ;
+USING: arrays combinators fry generalizations kernel macros
+math sequences ;
 IN: combinators.short-circuit
 
 <PRIVATE

diff --git a/basis/command-line/command-line.factor b/basis/command-line/command-line.factor
index 1ecac701ddef5308327c57dd8019c44d657df30b..bbabed7b53e0228ead12a46f8269b22865abc114 100644 (file)
--- a/basis/command-line/command-line.factor
+++ b/basis/command-line/command-line.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2003, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.strings assocs continuations fry
-hashtables init io io.encodings.utf8 io.files io.pathnames
-kernel kernel.private namespaces parser parser.notes sequences
-source-files source-files.errors splitting strings system
-tools.errors vocabs.loader ;
+USING: accessors alien.strings assocs continuations fry init
+io.encodings.utf8 io.files io.pathnames kernel kernel.private
+namespaces parser parser.notes sequences source-files
+source-files.errors splitting system tools.errors
+vocabs.loader ;
 IN: command-line
 
 SYMBOL: user-init-errors

diff --git a/basis/tools/profiler/sampling/sampling.factor b/basis/tools/profiler/sampling/sampling.factor
index af1ddf378f77f0f222569854eba35699b2c62f18..dd1dd8402b6c2b1f3160838feb872341059901ec 100644 (file)
--- a/basis/tools/profiler/sampling/sampling.factor
+++ b/basis/tools/profiler/sampling/sampling.factor
@@ -1,11 +1,10 @@
 ! (c)2011 Joe Groff bsd license
 USING: accessors assocs calendar combinators
 combinators.short-circuit continuations fry generalizations
-hashtables.identity io kernel kernel.private locals math
-math.statistics math.vectors memory namespaces prettyprint
-sequences sequences.generalizations sets sorting
-tools.profiler.sampling.private math.parser.private
-math.parser layouts ;
+hashtables.identity io kernel kernel.private layouts locals
+math math.parser math.parser.private math.statistics
+math.vectors memory namespaces prettyprint sequences
+sequences.generalizations sets sorting ;
 FROM: sequences => change-nth ;
 FROM: assocs => change-at ;
 IN: tools.profiler.sampling

diff --git a/core/alien/alien.factor b/core/alien/alien.factor
index 56ac7b01c10adf911394d6fa75d4dec58c98cfc8..83c8fb41a6de3f4cbe217ca90fcc0f2f870cb9cc 100755 (executable)
--- a/core/alien/alien.factor
+++ b/core/alien/alien.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs kernel math namespaces sequences system
-kernel.private byte-arrays byte-vectors arrays init
-continuations.private ;
+USING: accessors byte-arrays byte-vectors continuations.private
+init kernel kernel.private math namespaces sequences ;
 IN: alien
 
 PREDICATE: pinned-alien < alien underlying>> not ;

diff --git a/core/arrays/arrays.factor b/core/arrays/arrays.factor
index 62a0774444887ff59079ee81e9edb889b7da1aa8..21f9c239fd94a72421ae7cb9304f8d0c4278a0cf 100644 (file)
--- a/core/arrays/arrays.factor
+++ b/core/arrays/arrays.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel kernel.private math math.private
-sequences sequences.private ;
+USING: accessors kernel math sequences sequences.private ;
 IN: arrays
 
 M: array clone (clone) ; inline

diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor
index d2b0a1f77f302757ced7b0bbfcf169fe0c08eb97..f2fee03997ce61d4947cac255a98fe3f2a83e34f 100644 (file)
--- a/core/assocs/assocs.factor
+++ b/core/assocs/assocs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2010 Daniel Ehrenberg, Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences arrays math sequences.private vectors
-accessors ;
+USING: accessors arrays kernel math sequences sequences.private
+vectors ;
 IN: assocs
 
 MIXIN: assoc

diff --git a/core/checksums/checksums.factor b/core/checksums/checksums.factor
index 4c55358e56b50241d1b8f8b28846daf2aeec35c7..96df574b6fb54cfacfc259110cd6e5d382a9d3ee 100644 (file)
--- a/core/checksums/checksums.factor
+++ b/core/checksums/checksums.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors io io.backend io.files kernel math math.parser
-sequences byte-arrays byte-vectors quotations ;
+USING: accessors byte-arrays byte-vectors io io.backend
+io.files kernel math math.parser sequences ;
 IN: checksums
 
 MIXIN: checksum

diff --git a/core/combinators/combinators.factor b/core/combinators/combinators.factor
index 76dd113976a63ebd621cdf72bbfa6684b67b35d1..95a1b980eafc6fca9bbfba1375caf31f9311b1c1 100644 (file)
--- a/core/combinators/combinators.factor
+++ b/core/combinators/combinators.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2006, 2010 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays sequences sequences.private math.private
-kernel kernel.private math assocs quotations vectors
-hashtables sorting words sets math.order make ;
+USING: accessors arrays assocs hashtables kernel kernel.private
+make math math.order math.private quotations sequences
+sequences.private sets sorting words ;
 IN: combinators
 
 ! Most of these combinators have compile-time expansions in

diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor
index fb7b6d505fcf9d9149139a0ce13048ed8350c74a..004c7254703f09c533d2ccfe338c374847d601a7 100644 (file)
--- a/core/compiler/units/units.factor
+++ b/core/compiler/units/units.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays kernel continuations assocs namespaces
-sequences words vocabs definitions hashtables init sets math
-math.order classes classes.private classes.algebra classes.tuple
-classes.tuple.private generic source-files.errors kernel.private ;
+USING: accessors arrays assocs classes classes.private
+classes.tuple classes.tuple.private continuations definitions
+generic init kernel kernel.private math namespaces sequences
+sets source-files.errors vocabs words ;
 FROM: namespaces => set ;
 IN: compiler.units
 

diff --git a/core/continuations/continuations.factor b/core/continuations/continuations.factor
index b63e34262d75495fb8192488184a138dae9bdb9a..ca2acbca46a182fd661efe8dcefbce4711dc264b 100644 (file)
--- a/core/continuations/continuations.factor
+++ b/core/continuations/continuations.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2003, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays vectors kernel kernel.private sequences
-namespaces make math splitting sorting quotations assocs
-combinators combinators.private accessors words ;
+USING: accessors assocs combinators combinators.private kernel
+kernel.private make namespaces sequences vectors ;
 IN: continuations
 
 : with-datastack ( stack quot -- new-stack )

diff --git a/core/definitions/definitions.factor b/core/definitions/definitions.factor
index e255b161ee8c6834b7054bd5013e09cf05f74219..14870e92aadf9c7d229472d38189280bd465e98e 100644 (file)
--- a/core/definitions/definitions.factor
+++ b/core/definitions/definitions.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences namespaces assocs math accessors ;
+USING: accessors assocs kernel namespaces sequences ;
 IN: definitions
 
 MIXIN: definition

diff --git a/core/generic/generic.factor b/core/generic/generic.factor
index 2ba2f412cd532d5f7022a79cab620fb0a447862f..e9c9c349cfe605c77ab96ebfb17f0cae09e71eeb 100644 (file)
--- a/core/generic/generic.factor
+++ b/core/generic/generic.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2006, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors words kernel sequences namespaces make assocs
-hashtables definitions kernel.private classes classes.private
-classes.algebra quotations arrays vocabs effects combinators
-sets classes.maybe classes.algebra.private ;
+USING: accessors arrays assocs classes classes.algebra
+classes.algebra.private classes.maybe classes.private
+combinators definitions kernel make namespaces sequences sets
+words ;
 FROM: namespaces => set ;
 IN: generic
 

diff --git a/core/generic/hook/hook.factor b/core/generic/hook/hook.factor
index 17fd857b56864c77be1a4b9e9bf5ae0b097eea31..bdbc102e696bc5ccb56f130e9690c5afd61fa732 100644 (file)
--- a/core/generic/hook/hook.factor
+++ b/core/generic/hook/hook.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors definitions generic generic.single
-generic.single.private kernel namespaces words kernel.private
-quotations sequences ;
+USING: accessors definitions generic generic.single kernel
+kernel.private namespaces quotations sequences words ;
 QUALIFIED-WITH: generic.single.private gsp
 IN: generic.hook
 

diff --git a/core/generic/math/math.factor b/core/generic/math/math.factor
index fa84c57b921b91aa5e4e84991595e30263673ef3..67701f2fb9e76a89ec8a2f59c40268439c19c109 100644 (file)
--- a/core/generic/math/math.factor
+++ b/core/generic/math/math.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays generic hashtables kernel kernel.private math
-namespaces sequences words quotations layouts combinators
-sequences.private classes classes.builtin classes.algebra
-definitions math.order math.private assocs ;
+USING: arrays assocs classes classes.algebra combinators
+definitions generic kernel kernel.private math math.order
+math.private namespaces quotations sequences words ;
 IN: generic.math
 
 PREDICATE: math-class < class

diff --git a/core/generic/parser/parser.factor b/core/generic/parser/parser.factor
index f1c709d11212671be2a22dbbc4199c19e17f6088..fe8d9537939df673e346f0d558a32fcab5fc183b 100644 (file)
--- a/core/generic/parser/parser.factor
+++ b/core/generic/parser/parser.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators effects effects.parser
-generic kernel namespaces parser quotations sequences words ;
+USING: accessors arrays combinators effects.parser generic
+kernel namespaces parser quotations sequences words ;
 IN: generic.parser
 
 ERROR: not-in-a-method-error ;

diff --git a/core/generic/single/single.factor b/core/generic/single/single.factor
index 82d373c524515105266760297db882a2ee9c7f75..2ef68c9292c5084588b6127ecc12fe3ff42078b7 100644 (file)
--- a/core/generic/single/single.factor
+++ b/core/generic/single/single.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs classes classes.algebra
-combinators definitions generic hashtables kernel
-kernel.private layouts math namespaces quotations
-sequences words generic.single.private effects make
-combinators.private ;
+combinators combinators.private definitions effects generic
+hashtables kernel layouts make math namespaces quotations
+sequences words ;
 FROM: assocs => change-at ;
 IN: generic.single
 

diff --git a/core/generic/standard/standard.factor b/core/generic/standard/standard.factor
index 35d299145d7d03aa0bd5ce7e3df18acca5bf4422..e8b342e777703ac032217cb8b0b3f28ec877b2e2 100644 (file)
--- a/core/generic/standard/standard.factor
+++ b/core/generic/standard/standard.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors definitions generic generic.single kernel
-namespaces words math math.order combinators sequences
-generic.single.private quotations kernel.private
-assocs arrays layouts make ;
+USING: accessors arrays combinators definitions generic
+generic.single generic.single.private kernel layouts make math
+namespaces quotations sequences words ;
 IN: generic.standard
 
 ERROR: bad-dispatch-position # ;

diff --git a/core/io/io.factor b/core/io/io.factor
index d4d54b885250e4ea17f97795504b0b1deb665235..d0687e500deaa64f7300e889051beca972904cdd 100644 (file)
--- a/core/io/io.factor
+++ b/core/io/io.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2003, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien byte-arrays combinators continuations destructors
-kernel math namespaces sequences sequences.private kernel.private ;
+USING: combinators destructors kernel kernel.private math
+namespaces sequences sequences.private ;
 IN: io
 
 SYMBOLS: +byte+ +character+ ;

diff --git a/core/math/parser/parser.factor b/core/math/parser/parser.factor
index 4514bb6b652ef11007014ce5e72f30deb4873dbb..bae9f473fee44b3e7cbf7ae101bdc09d79408352 100644 (file)
--- a/core/math/parser/parser.factor
+++ b/core/math/parser/parser.factor
@@ -1,7 +1,7 @@
 ! (c)2009 Joe Groff bsd license
 USING: accessors byte-arrays combinators kernel kernel.private
-math namespaces sequences sequences.private splitting strings
-make ;
+make math namespaces sequences sequences.private splitting
+strings ;
 IN: math.parser
 
 : digit> ( ch -- n )

diff --git a/core/memory/memory.factor b/core/memory/memory.factor
index a1e977f553901d7c58e13010cbe275597f90e693..c9bef9a23f621e41a43dfb2cfcfb19018bd7c314 100644 (file)
--- a/core/memory/memory.factor
+++ b/core/memory/memory.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.strings io.backend io.pathnames kernel
-memory.private sequences system ;
+USING: alien.strings io.backend kernel memory.private sequences
+system ;
 IN: memory
 
 : instances ( quot -- seq )

diff --git a/core/namespaces/namespaces.factor b/core/namespaces/namespaces.factor
index 467086abc6cb47f9e21fbc1c02abbf023ef5a99d..9029bb9a6a1678c99500f20eadf9a757bc69f2cb 100644 (file)
--- a/core/namespaces/namespaces.factor
+++ b/core/namespaces/namespaces.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2003, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel vectors sequences sequences.private hashtables
-arrays kernel.private math strings assocs ;
+USING: arrays assocs hashtables kernel kernel.private math
+sequences vectors ;
 SLOT: boxes
 SLOT: value
 FROM: accessors => boxes>> value>> value<< ;

diff --git a/core/parser/notes/notes.factor b/core/parser/notes/notes.factor
index e2ab2d14201ccb1e9f555eee2edab08737347ebb..26bb29074297089d0d2c2ed0a5d8eb0b0d771b80 100644 (file)
--- a/core/parser/notes/notes.factor
+++ b/core/parser/notes/notes.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces kernel source-files lexer accessors io math.parser ;
+USING: accessors io kernel lexer math.parser namespaces
+source-files ;
 IN: parser.notes
 
 SYMBOL: parser-quiet?

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 5ab2579b1a41ca701ed643ce5e91da8b8690680d..6895b3a34870579d3ed5c228c28a067b4ed00b32 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2011 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel kernel.private slots.private math
-math.private math.order ;
+USING: accessors kernel kernel.private math math.order
+math.private slots.private ;
 IN: sequences
 
 MIXIN: sequence

diff --git a/core/sets/sets.factor b/core/sets/sets.factor
index 1c4a3446125e1707f4302fda045aae4a40fa9f66..0e08bb2bfcafd46ce125f5a2767a4f33b6a76dde 100644 (file)
--- a/core/sets/sets.factor
+++ b/core/sets/sets.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2010 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs hashtables kernel vectors
-math sequences ;
+USING: assocs hashtables kernel math sequences vectors ;
 FROM: assocs => change-at ;
 IN: sets
 

diff --git a/core/splitting/splitting.factor b/core/splitting/splitting.factor
index 2011a24428325555a786dcddcc952835eafb98f1..5ac6297ddc550a26829510bb08cc00df04806800 100644 (file)
--- a/core/splitting/splitting.factor
+++ b/core/splitting/splitting.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math make strings arrays vectors sequences
-sets math.order accessors ;
+USING: arrays kernel make math sequences sets strings ;
 IN: splitting
 
 <PRIVATE

diff --git a/core/system/system.factor b/core/system/system.factor
index 731cbd31087c289bfd05817cee20bd68cb77efd4..595c439f0cc6fe7e76cf01442a840b26dff185e2 100644 (file)
--- a/core/system/system.factor
+++ b/core/system/system.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2007, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel kernel.private sequences math namespaces
-init splitting assocs system.private layouts words ;
+USING: assocs init kernel.private namespaces ;
 IN: system
 
 SINGLETONS: x86.32 x86.64 arm ppc.32 ppc.64 ;

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 6a1f781713afcda6891543495a6d56e4a365eb38..5e097ecc6c68077b1e31b267a63da42b30f97d31 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2007, 2010 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces make sequences io io.files io.pathnames kernel
-assocs words vocabs definitions parser continuations hashtables
-sorting source-files arrays combinators strings system
-math.parser splitting init accessors sets ;
+USING: accessors arrays assocs continuations definitions init
+io io.files io.pathnames kernel make namespaces parser
+sequences sets splitting strings vocabs words ;
 IN: vocabs.loader
 
 SYMBOL: vocab-roots

diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index f1fc12391edb9cf82ec11411558c99631fce3611..5067d88f50c55dd1417550108c39c101328b307f 100644 (file)
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs strings kernel sorting namespaces
-sequences definitions sets combinators splitting ;
+USING: accessors assocs definitions kernel namespaces sequences
+sets sorting splitting strings ;
 IN: vocabs
 
 SYMBOL: dictionary