factor: More using list cleanup

diff --git a/basis/calendar/calendar.factor b/basis/calendar/calendar.factor
index 01811b7c97e9f2884d4e4c50bf913f53997b5ae2..054282d6dd19edb0b2ffaa89ead076874eac3348 100644 (file)
--- a/basis/calendar/calendar.factor
+++ b/basis/calendar/calendar.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays classes.tuple combinators
 combinators.short-circuit kernel literals math math.functions
-math.intervals math.order math.parser math.statistics sequences
-slots.syntax splitting system vocabs vocabs.loader ;
+math.intervals math.order math.statistics sequences slots.syntax
+system vocabs vocabs.loader ;
 FROM: math.ranges => [a..b) ;
 IN: calendar
 

diff --git a/basis/calendar/windows/windows.factor b/basis/calendar/windows/windows.factor
index dea9f7257ea2b3cfd08260cf87ae52cf8fe39033..0fa3f2ea208a13d55d295f108e8d53336e3fd7f2 100644 (file)
--- a/basis/calendar/windows/windows.factor
+++ b/basis/calendar/windows/windows.factor
@@ -1,6 +1,5 @@
-USING: calendar namespaces alien.c-types system
-windows.kernel32 kernel math combinators windows.errors
-accessors classes.struct calendar.format math.functions ;
+USING: accessors calendar classes.struct combinators kernel math
+math.functions system windows.errors windows.kernel32 ;
 IN: calendar.windows
 
 : timestamp>SYSTEMTIME ( timestamp -- SYSTEMTIME )

diff --git a/basis/regexp/ast/ast.factor b/basis/regexp/ast/ast.factor
index 91ad42dd7e18cf7d372678aef9a463aeea7da8f2..ba206c6dac60570ac719f5ca3ec98e866823317d 100644 (file)
--- a/basis/regexp/ast/ast.factor
+++ b/basis/regexp/ast/ast.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel arrays accessors fry sequences regexp.classes
-math.ranges math ;
+USING: accessors arrays kernel math regexp.classes sequences ;
 IN: regexp.ast
 
 TUPLE: negation term ;

diff --git a/basis/regexp/classes/classes.factor b/basis/regexp/classes/classes.factor
index 780ba37f938d63474a10e08ece67148627d95254..464f8c03de66b5f0d5238a651440236c77017c05 100644 (file)
--- a/basis/regexp/classes/classes.factor
+++ b/basis/regexp/classes/classes.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs classes combinators
-combinators.short-circuit combinators.smart fry kernel locals
-math math.order sequences sets unicode unicode.data ;
+combinators.short-circuit combinators.smart kernel math
+math.order sequences sets unicode unicode.data ;
 FROM: ascii => ascii? ;
 IN: regexp.classes
 

diff --git a/basis/regexp/combinators/combinators.factor b/basis/regexp/combinators/combinators.factor
index 503f0bb1f03ed9f9a3292db4e52af2c213fc5eff..41df5916c8122d3a564337f551acb6beca07e529 100644 (file)
--- a/basis/regexp/combinators/combinators.factor
+++ b/basis/regexp/combinators/combinators.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: regexp sequences kernel regexp.negation regexp.ast
-accessors fry regexp.classes strings ;
+USING: accessors kernel regexp regexp.ast regexp.classes
+sequences strings ;
 IN: regexp.combinators
 
 <PRIVATE

diff --git a/basis/regexp/compiler/compiler.factor b/basis/regexp/compiler/compiler.factor
index f4fff592ecea35370d9a7653b4212ec9e1e469e9..c4b3aa2b6981ebc0743576a6e817f2a5dbb151c9 100644 (file)
--- a/basis/regexp/compiler/compiler.factor
+++ b/basis/regexp/compiler/compiler.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators combinators.short-circuit
-fry kernel kernel.private locals math namespaces regexp.classes
+kernel kernel.private math namespaces regexp.classes
 regexp.transition-tables sequences sequences.private sets
 strings unicode words ;
 IN: regexp.compiler

diff --git a/basis/regexp/dfa/dfa.factor b/basis/regexp/dfa/dfa.factor
index c65ae25a7a3d79683ea0582e4a5e4b713876ac73..07d164a92024b383fb95e05575fe6b7d74ba3c22 100644 (file)
--- a/basis/regexp/dfa/dfa.factor
+++ b/basis/regexp/dfa/dfa.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs fry kernel locals regexp.ast
-regexp.classes regexp.transition-tables sequences sets vectors ;
+USING: accessors arrays assocs kernel regexp.ast regexp.classes
+regexp.transition-tables sequences sets vectors ;
 IN: regexp.dfa
 
 : find-delta ( states transition nfa -- new-states )

diff --git a/basis/regexp/disambiguate/disambiguate.factor b/basis/regexp/disambiguate/disambiguate.factor
index cdccc88d87cea4b7774b0306586f225202017546..c4bdfc62b58c49dbe58231043239b7decc7ea65b 100644 (file)
--- a/basis/regexp/disambiguate/disambiguate.factor
+++ b/basis/regexp/disambiguate/disambiguate.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs fry kernel locals math math.bits
-regexp.ast regexp.classes regexp.transition-tables sequences
-sets ;
+USING: accessors arrays assocs kernel math math.bits regexp.ast
+regexp.classes regexp.transition-tables sequences sets ;
 IN: regexp.disambiguate
 
 TUPLE: parts in out ;

diff --git a/basis/regexp/minimize/minimize.factor b/basis/regexp/minimize/minimize.factor
index 2effba91d0a61b6ccc4f4217196a846208edd63e..8f85a86204e7796b19ad10d0326baae00701f712 100644 (file)
--- a/basis/regexp/minimize/minimize.factor
+++ b/basis/regexp/minimize/minimize.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators.short-circuit fry
-hash-sets kernel locals math regexp.classes
-regexp.transition-tables sequences sets sorting ;
+USING: accessors arrays assocs combinators.short-circuit
+hash-sets kernel math regexp.classes regexp.transition-tables
+sequences sets sorting ;
 IN: regexp.minimize
 
 : table>state-numbers ( table -- assoc )

diff --git a/basis/regexp/negation/negation.factor b/basis/regexp/negation/negation.factor
index 1b82b3633a23c3d63721a0d8ca697588162adeb4..45e35df1fd4ce460d202746a0fbd778ee003c735 100644 (file)
--- a/basis/regexp/negation/negation.factor
+++ b/basis/regexp/negation/negation.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs fry hashtables kernel namespaces
-regexp.ast regexp.classes regexp.dfa regexp.disambiguate
-regexp.minimize regexp.nfa regexp.transition-tables sequences
-sets vectors ;
+USING: accessors assocs hashtables kernel namespaces regexp.ast
+regexp.classes regexp.dfa regexp.disambiguate regexp.minimize
+regexp.nfa regexp.transition-tables sequences sets vectors ;
 IN: regexp.negation
 
 CONSTANT: fail-state -1

diff --git a/basis/regexp/nfa/nfa.factor b/basis/regexp/nfa/nfa.factor
index ea4671e8833415f07639a5da3c14d984063d15e7..6912e4d94cd4dffffa2a917d53d59d168440fb8f 100644 (file)
--- a/basis/regexp/nfa/nfa.factor
+++ b/basis/regexp/nfa/nfa.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators.short-circuit fry
-kernel locals math memoize namespaces regexp.ast regexp.classes
+USING: accessors arrays assocs combinators.short-circuit kernel
+math namespaces regexp.ast regexp.classes
 regexp.transition-tables sequences sets unicode vectors ;
 IN: regexp.nfa
 

diff --git a/basis/regexp/parser/parser.factor b/basis/regexp/parser/parser.factor
index 28b99cfb094a3aad14c09a8cfb6f6276b1a2224c..605688b1c6c9b051251a2ffaf9da1fe55205c488 100644 (file)
--- a/basis/regexp/parser/parser.factor
+++ b/basis/regexp/parser/parser.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
-combinators.short-circuit interval-maps kernel locals
-math.parser memoize multiline peg.ebnf regexp.ast regexp.classes
-sequences sets splitting strings unicode unicode.data
-unicode.script ;
+combinators.short-circuit interval-maps kernel math.parser
+multiline peg.ebnf regexp.ast regexp.classes sequences sets
+splitting strings unicode unicode.data unicode.script ;
 IN: regexp.parser
 
 : allowed-char? ( ch -- ? )

diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor
index 1e7bbab9622799d5cd466468b5437044c2f0c7f8..b09810c9160d5cadec7499c231c45002ce82f963 100644 (file)
--- a/basis/regexp/regexp.factor
+++ b/basis/regexp/regexp.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008, 2009 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators kernel kernel.private math sequences
-sequences.private strings sets assocs make lexer namespaces parser
-arrays fry locals regexp.parser splitting sorting regexp.ast
-regexp.negation regexp.compiler compiler.units words math.ranges ;
+USING: accessors arrays compiler.units kernel kernel.private
+lexer make math math.ranges namespaces regexp.ast
+regexp.compiler regexp.negation regexp.parser sequences
+sequences.private splitting strings vocabs.loader words ;
 IN: regexp
 
 TUPLE: regexp
@@ -221,6 +221,5 @@ PRIVATE>
 
 SYNTAX: R/ parse-regexp ;
 
-USE: vocabs.loader
 
 { "prettyprint" "regexp" } "regexp.prettyprint" require-when

diff --git a/basis/regexp/transition-tables/transition-tables.factor b/basis/regexp/transition-tables/transition-tables.factor
index 4352ba997900d486ccac80ad350bed030c4c44e5..b10da4a50d3180635036ba4a6f0c61816745ddc8 100644 (file)
--- a/basis/regexp/transition-tables/transition-tables.factor
+++ b/basis/regexp/transition-tables/transition-tables.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs fry hashtables kernel locals
-regexp.classes sequences sets vectors ;
+USING: accessors arrays assocs hashtables kernel regexp.classes
+sequences sets vectors ;
 IN: regexp.transition-tables
 
 TUPLE: transition-table transitions start-state final-states ;

diff --git a/core/io/encodings/ascii/ascii.factor b/core/io/encodings/ascii/ascii.factor
index ddb0818c82c9983357acdc5349f8b3eea480aaac..fde5e51ec6b08547cd5b6a8e2978ae4ef3d62c81 100644 (file)
--- a/core/io/encodings/ascii/ascii.factor
+++ b/core/io/encodings/ascii/ascii.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors byte-arrays io io.encodings
-io.encodings.private kernel math sequences strings ;
+USING: accessors io io.encodings io.encodings.private kernel
+math sequences strings ;
 IN: io.encodings.ascii
 
 SINGLETON: ascii