factor: Trimming ``USING:`` lists.

diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
index bae6650e1d01399484ce84a93dbe02d9e09f6e70..74f4e5d1bc5c389231211c34e2c498134b98707b 100644 (file)
--- a/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.accessors arrays classes combinators
-compiler.units cpu.architecture delegate fry kernel layouts macros
-math math.order math.parser quotations sequences summary system words
-words.symbol ;
+USING: accessors alien alien.accessors arrays classes
+combinators compiler.units cpu.architecture delegate kernel
+layouts math math.order math.parser quotations sequences summary
+system words words.symbol ;
 IN: alien.c-types
 
 SYMBOLS:

diff --git a/basis/alien/syntax/syntax.factor b/basis/alien/syntax/syntax.factor
index cbf93f735a66ed585b19bfab13623b7d56219fa0..86e12601de03bd5109da2fcb2c09e627033e3f23 100644 (file)
--- a/basis/alien/syntax/syntax.factor
+++ b/basis/alien/syntax/syntax.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2010 Slava Pestov, Alex Chapman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.enums alien.libraries
-alien.parser fry kernel lexer namespaces parser sequences
+alien.parser kernel lexer namespaces parser sequences
 strings.parser vocabs words ;
 << "alien.arrays" require >> ! needed for bootstrap
 IN: alien.syntax

diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
index cc1cb07c7618b789e08e51075fede4f2c4b501b1..48cef2c15ba09e36eb58d0ead73b168b7740a8b2 100644 (file)
--- a/basis/bootstrap/image/image.factor
+++ b/basis/bootstrap/image/image.factor
@@ -4,12 +4,12 @@ USING: accessors arrays assocs byte-arrays classes
 classes.builtin classes.private classes.tuple
 classes.tuple.private combinators combinators.short-circuit
 combinators.smart command-line compiler.codegen.relocation
-compiler.units fry generic generic.single.private grouping
+compiler.units generic generic.single.private grouping
 hashtables hashtables.private io io.binary io.encodings.binary
-io.files io.pathnames kernel kernel.private layouts locals make
-math math.order namespaces namespaces.private parser
-parser.notes prettyprint quotations sequences sequences.private
-source-files strings system vectors vocabs words ;
+io.files io.pathnames kernel kernel.private layouts make math
+math.order namespaces namespaces.private parser parser.notes
+prettyprint quotations sequences sequences.private source-files
+strings system vectors vocabs words ;
 IN: bootstrap.image
 
 : arch-name ( os cpu -- arch )

diff --git a/basis/cairo/cairo.factor b/basis/cairo/cairo.factor
index f55023d69e10f439426a2c95c5106cc8f95787fb..0d04803f409122b382c162fce27998536145de8d 100644 (file)
--- a/basis/cairo/cairo.factor
+++ b/basis/cairo/cairo.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: colors fonts cairo.ffi alien alien.c-types kernel accessors
-sequences namespaces fry continuations destructors math images
-images.memory math.rectangles ;
+USING: accessors alien alien.c-types cairo.ffi colors images
+images.memory kernel math math.rectangles sequences ;
 IN: cairo
 
 ERROR: cairo-error n message ;

diff --git a/basis/circular/circular.factor b/basis/circular/circular.factor
index c49d20aa22c834bad229c10edafb79a60bef3efa..b30b7aa3d0854213d4ec1f35c7080aa9b5386351 100644 (file)
--- a/basis/circular/circular.factor
+++ b/basis/circular/circular.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2006 Alex Chapman, Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license
-USING: accessors arrays fry kernel math sequences strings ;
+USING: accessors arrays kernel math sequences strings ;
 IN: circular
 
 TUPLE: circular { seq read-only } { start integer } ;

diff --git a/basis/classes/struct/bit-accessors/bit-accessors.factor b/basis/classes/struct/bit-accessors/bit-accessors.factor
index 9893ce416c616a898c55058b81c2cbf4f0fe44cc..86692446d8834e313963a10353178a9bcc0a78d8 100644 (file)
--- a/basis/classes/struct/bit-accessors/bit-accessors.factor
+++ b/basis/classes/struct/bit-accessors/bit-accessors.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.accessors fry kernel locals math math.bitwise
-math.order sequences ;
+USING: alien.accessors kernel math math.bitwise math.order ;
 IN: classes.struct.bit-accessors
 
 ! Bitfield accessors are little-endian on all platforms

diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor
index 5a39fb607ea01bad120e1895177dbbcb47a6bc6b..3420ee325d191ae12f793020ce72ef9c3bf39f1b 100644 (file)
--- a/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor
@@ -5,9 +5,9 @@ USING: accessors alien alien.c-types alien.data alien.parser
 arrays byte-arrays classes classes.parser classes.private
 classes.struct.bit-accessors classes.tuple classes.tuple.parser
 combinators combinators.smart cpu.architecture definitions
-delegate.private fry functors.backend generalizations generic
-generic.parser io kernel kernel.private lexer libc locals macros
-math math.order parser quotations sequences slots slots.private
+delegate.private functors.backend generalizations generic
+generic.parser io kernel kernel.private lexer libc math
+math.order parser quotations sequences slots slots.private
 specialized-arrays stack-checker.dependencies summary vectors
 vocabs.loader vocabs.parser words ;
 IN: classes.struct

diff --git a/basis/cocoa/enumeration/enumeration.factor b/basis/cocoa/enumeration/enumeration.factor
index 4f5a69697a97d00e69c6d3c418db42ee4f71e77b..507b8b9e7b6ee820e2d8051e013faf7df7b2a766 100644 (file)
--- a/basis/cocoa/enumeration/enumeration.factor
+++ b/basis/cocoa/enumeration/enumeration.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.data assocs classes.struct cocoa
-cocoa.runtime cocoa.types destructors fry hashtables kernel libc
-locals sequences specialized-arrays vectors ;
+cocoa.runtime cocoa.types destructors hashtables kernel libc
+sequences specialized-arrays vectors ;
+IN: cocoa.enumeration
 SPECIALIZED-ARRAY: id
 IN: cocoa.enumeration
 

diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor
index 67a5fb1ae4cf04a55bcba4c17384729033f16eb0..780e7717b7c298587330e2362b7f705e0265be0c 100644 (file)
--- a/basis/cocoa/messages/messages.factor
+++ b/basis/cocoa/messages/messages.factor
@@ -2,10 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data alien.strings
 arrays assocs classes.struct cocoa.runtime cocoa.types
-combinators core-graphics.types fry generalizations
-io.encodings.utf8 kernel layouts libc locals macros make math
-memoize namespaces quotations sequences sets specialized-arrays
-splitting stack-checker strings words ;
+combinators core-graphics.types generalizations
+io.encodings.utf8 kernel layouts libc make math namespaces
+sequences sets specialized-arrays splitting stack-checker
+strings words ;
 QUALIFIED-WITH: alien.c-types c
 IN: cocoa.messages
 

diff --git a/basis/combinators/short-circuit/smart/smart.factor b/basis/combinators/short-circuit/smart/smart.factor
index 7264a07917a1867fd933efc750f96ec5240741f5..d4fbd506ba83104c89ea5c1b9415481b7899df17 100644 (file)
--- a/basis/combinators/short-circuit/smart/smart.factor
+++ b/basis/combinators/short-circuit/smart/smart.factor
@@ -1,5 +1,5 @@
-USING: kernel sequences math stack-checker effects accessors
-macros fry combinators.short-circuit ;
+USING: accessors combinators.short-circuit effects kernel math
+sequences stack-checker ;
 IN: combinators.short-circuit.smart
 
 <PRIVATE

diff --git a/basis/compiler/cfg/alias-analysis/alias-analysis.factor b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
index bd5d9fa98330f546497004534a2aa3706f622dd8..c39315645cca5d07831fafb1653e17137f9b5ddd 100644 (file)
--- a/basis/compiler/cfg/alias-analysis/alias-analysis.factor
+++ b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
@@ -3,8 +3,8 @@
 USING: accessors arrays assocs combinators.short-circuit
 compiler.cfg.comparisons compiler.cfg.instructions
 compiler.cfg.representations.preferred compiler.cfg.rpo
-compiler.cfg.utilities cpu.architecture fry kernel locals math
-namespaces sequences sets ;
+compiler.cfg.utilities cpu.architecture kernel math namespaces
+sequences sets ;
 IN: compiler.cfg.alias-analysis
 
 ! Local copy propagation

diff --git a/basis/compiler/cfg/branch-splitting/branch-splitting.factor b/basis/compiler/cfg/branch-splitting/branch-splitting.factor
index f58a375430708e8628ae4e607537ec2baa683a5a..064423fbce4f682958a880680e0a8d4be1345c84 100644 (file)
--- a/basis/compiler/cfg/branch-splitting/branch-splitting.factor
+++ b/basis/compiler/cfg/branch-splitting/branch-splitting.factor
@@ -3,8 +3,7 @@
 USING: accessors arrays combinators combinators.short-circuit
 compiler.cfg compiler.cfg.instructions compiler.cfg.predecessors
 compiler.cfg.renaming compiler.cfg.rpo compiler.cfg.utilities
-deques dlists fry kernel locals math namespaces sequences sets
-vectors ;
+deques dlists kernel math namespaces sequences sets vectors ;
 IN: compiler.cfg.branch-splitting
 
 : clone-instructions ( insns -- insns' )

diff --git a/basis/compiler/cfg/builder/builder.factor b/basis/compiler/cfg/builder/builder.factor
index b8402f452f136b0f35d72c184bc0bf829af56df7..27de57e9f47fabb75eae4e4b037056e9c0eee454 100644 (file)
--- a/basis/compiler/cfg/builder/builder.factor
+++ b/basis/compiler/cfg/builder/builder.factor
@@ -1,13 +1,14 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators compiler.cfg
-compiler.cfg.builder.blocks compiler.cfg.comparisons compiler.cfg.hats
-compiler.cfg.instructions compiler.cfg.intrinsics compiler.cfg.registers
-compiler.cfg.stacks compiler.cfg.stacks.local compiler.tree
-compiler.cfg.utilities cpu.architecture fry kernel locals make math
-namespaces sequences words ;
+compiler.cfg.builder.blocks compiler.cfg.comparisons
+compiler.cfg.hats compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.stacks
+compiler.cfg.stacks.local compiler.cfg.utilities compiler.tree
+cpu.architecture kernel make math namespaces sequences words ;
 IN: compiler.cfg.builder
 
+SLOT: return
 SYMBOL: procedures
 SYMBOL: loops
 

diff --git a/basis/compiler/cfg/copy-prop/copy-prop.factor b/basis/compiler/cfg/copy-prop/copy-prop.factor
index e205734110e7828f76c561b2ee2d78a85d1d5b4b..fed673055d3740b68052e5651003503feeb0c649 100644 (file)
--- a/basis/compiler/cfg/copy-prop/copy-prop.factor
+++ b/basis/compiler/cfg/copy-prop/copy-prop.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs compiler.cfg.def-use
+USING: accessors assocs compiler.cfg compiler.cfg.def-use
 compiler.cfg.instructions compiler.cfg.predecessors
 compiler.cfg.renaming compiler.cfg.rpo compiler.cfg.utilities
-fry grouping kernel namespaces sequences ;
+grouping kernel namespaces sequences ;
 IN: compiler.cfg.copy-prop
 
 <PRIVATE

diff --git a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
index 174eb095409b6b6f5b5f666bfd68bbbdbf50c02e..e30370ad1ab700f4948c3a6d20556a902c11d34a 100644 (file)
--- a/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
+++ b/basis/compiler/cfg/dataflow-analysis/dataflow-analysis.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators.short-circuit compiler.cfg.predecessors
-compiler.cfg.rpo compiler.cfg.utilities deques dlists functors kernel lexer
-locals namespaces sequences ;
+USING: accessors assocs combinators.short-circuit
+compiler.cfg.predecessors compiler.cfg.rpo
+compiler.cfg.utilities deques dlists functors kernel lexer
+namespaces sequences ;
 IN: compiler.cfg.dataflow-analysis
 
 GENERIC: join-sets ( sets bb dfa -- set )

diff --git a/basis/compiler/cfg/def-use/def-use.factor b/basis/compiler/cfg/def-use/def-use.factor
index e9210cb6d0ab9a15c0d13c23e5331c7763276f2d..54802a947e9cf869b0ddf5ec8820aa0f7df16781 100644 (file)
--- a/basis/compiler/cfg/def-use/def-use.factor
+++ b/basis/compiler/cfg/def-use/def-use.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators compiler.cfg
 compiler.cfg.instructions compiler.cfg.instructions.syntax
-compiler.cfg.rpo compiler.units fry generic kernel namespaces
+compiler.cfg.rpo compiler.units generic kernel namespaces
 quotations sequences sequences.generalizations sets slots words ;
 IN: compiler.cfg.def-use
 

diff --git a/basis/compiler/cfg/gc-checks/gc-checks.factor b/basis/compiler/cfg/gc-checks/gc-checks.factor
index db4f73e5fbf5de96f650ae21d1241f7e372001a4..8dfea2186b5de9566a5a83511bb3911a68f88ccb 100644 (file)
--- a/basis/compiler/cfg/gc-checks/gc-checks.factor
+++ b/basis/compiler/cfg/gc-checks/gc-checks.factor
@@ -3,8 +3,8 @@
 USING: accessors assocs compiler.cfg compiler.cfg.comparisons
 compiler.cfg.instructions compiler.cfg.predecessors
 compiler.cfg.registers compiler.cfg.rpo compiler.cfg.utilities
-cpu.architecture grouping kernel layouts locals make math
-namespaces sequences ;
+cpu.architecture grouping kernel layouts make math namespaces
+sequences ;
 IN: compiler.cfg.gc-checks
 
 <PRIVATE

diff --git a/basis/compiler/cfg/intrinsics/alien/alien.factor b/basis/compiler/cfg/intrinsics/alien/alien.factor
index ccb4eef3674a6cd5f1ef6d28551b8b3105cd8b2f..81deef46a53bd41f942dab62cd1959fa3d981b05 100644 (file)
--- a/basis/compiler/cfg/intrinsics/alien/alien.factor
+++ b/basis/compiler/cfg/intrinsics/alien/alien.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien classes.algebra combinators
-combinators.short-circuit compiler.cfg compiler.cfg.builder.blocks
+combinators.short-circuit compiler.cfg.builder.blocks
 compiler.cfg.hats compiler.cfg.instructions compiler.cfg.stacks
-compiler.tree.propagation.info cpu.architecture fry kernel locals math
-namespaces sequences ;
+compiler.tree.propagation.info cpu.architecture kernel math
+sequences ;
 IN: compiler.cfg.intrinsics.alien
 
 : emit-<displaced-alien>? ( node -- ? )

diff --git a/basis/compiler/cfg/intrinsics/allot/allot.factor b/basis/compiler/cfg/intrinsics/allot/allot.factor
index 65623ce47390ea211810ccd9e055462224de36d9..db950f3ac35e3725ece2f8d828354758f645343a 100644 (file)
--- a/basis/compiler/cfg/intrinsics/allot/allot.factor
+++ b/basis/compiler/cfg/intrinsics/allot/allot.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays byte-arrays compiler.cfg
-compiler.cfg.builder.blocks compiler.cfg.hats
-compiler.cfg.instructions compiler.cfg.registers compiler.cfg.stacks
-compiler.constants compiler.tree.propagation.info cpu.architecture fry
-kernel layouts locals math math.order namespaces sequences ;
+USING: accessors arrays byte-arrays compiler.cfg.builder.blocks
+compiler.cfg.hats compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.stacks compiler.constants
+compiler.tree.propagation.info cpu.architecture kernel layouts
+math math.order sequences ;
 IN: compiler.cfg.intrinsics.allot
 
 : ##set-slots, ( regs obj class -- )

diff --git a/basis/compiler/cfg/intrinsics/fixnum/fixnum.factor b/basis/compiler/cfg/intrinsics/fixnum/fixnum.factor
index 08c4543a243bc93333c90b14d4819fa853146f37..66691de328f11e7e9198b371f0812faa24d7b463 100644 (file)
--- a/basis/compiler/cfg/intrinsics/fixnum/fixnum.factor
+++ b/basis/compiler/cfg/intrinsics/fixnum/fixnum.factor
@@ -1,10 +1,11 @@
 ! Copyright (C) 2008, 2010 Slava Pestov, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators compiler.cfg.builder.blocks
-compiler.cfg.comparisons compiler.cfg.hats compiler.cfg.instructions
-compiler.cfg.registers compiler.cfg.stacks compiler.cfg.stacks.local
-compiler.tree.propagation.info cpu.architecture fry kernel layouts
-locals math math.intervals namespaces sequences ;
+compiler.cfg.comparisons compiler.cfg.hats
+compiler.cfg.instructions compiler.cfg.registers
+compiler.cfg.stacks compiler.cfg.stacks.local
+compiler.tree.propagation.info cpu.architecture kernel layouts
+math math.intervals namespaces sequences ;
 IN: compiler.cfg.intrinsics.fixnum
 
 : emit-both-fixnums? ( -- )

diff --git a/basis/compiler/cfg/intrinsics/float/float.factor b/basis/compiler/cfg/intrinsics/float/float.factor
index ff970d00437ff86d71b7f34b0ecb1c655ad3fe39..4757bbe91cd385219200e7e1d3f3b1db12343f0f 100644 (file)
--- a/basis/compiler/cfg/intrinsics/float/float.factor
+++ b/basis/compiler/cfg/intrinsics/float/float.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: compiler.cfg.hats compiler.cfg.stacks fry ;
+USING: compiler.cfg.hats compiler.cfg.stacks ;
 IN: compiler.cfg.intrinsics.float
 
 : emit-float-ordered-comparison ( cc -- )

diff --git a/basis/compiler/cfg/intrinsics/misc/misc.factor b/basis/compiler/cfg/intrinsics/misc/misc.factor
index 42a176eea30795e34af2217b903e7e99a4b6ee52..3855e7f4c5b5bbb6907d230382ac653300f43b9c 100644 (file)
--- a/basis/compiler/cfg/intrinsics/misc/misc.factor
+++ b/basis/compiler/cfg/intrinsics/misc/misc.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors classes.algebra classes.struct
-compiler.cfg.builder.blocks compiler.cfg.comparisons compiler.cfg.hats
-compiler.cfg.instructions compiler.cfg.stacks compiler.constants
-compiler.tree.propagation.info cpu.architecture kernel layouts math
-namespaces sequences vm ;
+compiler.cfg.builder.blocks compiler.cfg.comparisons
+compiler.cfg.hats compiler.cfg.instructions compiler.cfg.stacks
+compiler.constants compiler.tree.propagation.info
+cpu.architecture kernel layouts math namespaces sequences vm ;
 IN: compiler.cfg.intrinsics.misc
 
 : emit-tag ( -- )

diff --git a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
index bcf0df46b4fc6801070ea169001e1b52af3ba86f..5680ce2cfd3fd43ea64685f65dc85e95c85d33e6 100644 (file)
--- a/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
+++ b/basis/compiler/cfg/intrinsics/simd/backend/backend.factor
@@ -3,9 +3,8 @@
 USING: accessors arrays classes combinators
 compiler.cfg.instructions compiler.cfg.registers
 compiler.cfg.stacks compiler.cfg.stacks.local
-compiler.tree.propagation.info cpu.architecture fry
-generalizations kernel locals macros make math quotations
-sequences sequences.generalizations ;
+compiler.tree.propagation.info cpu.architecture generalizations
+kernel make math quotations sequences sequences.generalizations ;
 IN: compiler.cfg.intrinsics.simd.backend
 
 ! Selection of implementation based on available CPU instructions

diff --git a/basis/compiler/cfg/intrinsics/simd/simd.factor b/basis/compiler/cfg/intrinsics/simd/simd.factor
index 88f1a2e2fa29d578071b6d07bcc32cb2a950701e..070f0ac4d27bb829c53c8a0ea405f60ab517adb5 100644 (file)
--- a/basis/compiler/cfg/intrinsics/simd/simd.factor
+++ b/basis/compiler/cfg/intrinsics/simd/simd.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2009 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types arrays assocs byte-arrays combinators
-combinators.short-circuit compiler.cfg.comparisons
+USING: accessors alien.c-types arrays assocs byte-arrays
+combinators combinators.short-circuit compiler.cfg.comparisons
 compiler.cfg.hats compiler.cfg.instructions
 compiler.cfg.intrinsics compiler.cfg.intrinsics.alien
 compiler.cfg.intrinsics.simd.backend compiler.cfg.stacks
-cpu.architecture fry kernel layouts locals math math.vectors
+cpu.architecture kernel layouts math math.vectors
 math.vectors.simd.intrinsics sequences specialized-arrays ;
 FROM: alien.c-types => heap-size char short int longlong float double ;
 SPECIALIZED-ARRAYS: char uchar short ushort int uint longlong ulonglong float double ;

diff --git a/basis/compiler/cfg/intrinsics/slots/slots.factor b/basis/compiler/cfg/intrinsics/slots/slots.factor
index 35f76e7656d58d54e435246a235dc9c2abd6ab53..796c3b5c02023df597f42cc874aee937dc5224af 100644 (file)
--- a/basis/compiler/cfg/intrinsics/slots/slots.factor
+++ b/basis/compiler/cfg/intrinsics/slots/slots.factor
@@ -1,10 +1,11 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors classes.algebra classes.builtin
-combinators.short-circuit compiler.cfg compiler.cfg.builder.blocks
-compiler.cfg.hats compiler.cfg.instructions compiler.cfg.registers
-compiler.cfg.stacks compiler.tree.propagation.info cpu.architecture
-kernel layouts locals math namespaces sequences ;
+combinators.short-circuit compiler.cfg.builder.blocks
+compiler.cfg.hats compiler.cfg.instructions
+compiler.cfg.registers compiler.cfg.stacks
+compiler.tree.propagation.info cpu.architecture kernel layouts
+math namespaces sequences ;
 IN: compiler.cfg.intrinsics.slots
 
 : class-tag ( class -- tag/f )

diff --git a/basis/compiler/cfg/linear-scan/allocation/allocation.factor b/basis/compiler/cfg/linear-scan/allocation/allocation.factor
index 02cb69ff53a415a21e0cf8838d00c958ac5bcdaf..6cfcaef2be97ce89f9b8b2908454ddcf946460fe 100644 (file)
--- a/basis/compiler/cfg/linear-scan/allocation/allocation.factor
+++ b/basis/compiler/cfg/linear-scan/allocation/allocation.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators combinators.short-circuit
-compiler.cfg.linear-scan.allocation.spilling
+USING: accessors arrays assocs combinators
+combinators.short-circuit compiler.cfg.linear-scan.allocation.spilling
 compiler.cfg.linear-scan.allocation.state
-compiler.cfg.linear-scan.live-intervals compiler.cfg.linear-scan.ranges
-compiler.utilities fry heaps kernel locals math namespaces sequences ;
+compiler.cfg.linear-scan.live-intervals compiler.utilities heaps
+kernel namespaces sequences ;
 IN: compiler.cfg.linear-scan.allocation
 
 : active-positions ( new assoc -- )

diff --git a/basis/compiler/cfg/linear-scan/allocation/spilling/spilling.factor b/basis/compiler/cfg/linear-scan/allocation/spilling/spilling.factor
index 468b597b5f82ced55a660a02b1fbb5b49b9ba6bd..f8763c3fe246cc6a90c44848ca83a12f251e9d76 100644 (file)
--- a/basis/compiler/cfg/linear-scan/allocation/spilling/spilling.factor
+++ b/basis/compiler/cfg/linear-scan/allocation/spilling/spilling.factor
@@ -4,8 +4,8 @@ USING: accessors assocs combinators
 compiler.cfg.linear-scan.allocation.splitting
 compiler.cfg.linear-scan.allocation.state
 compiler.cfg.linear-scan.live-intervals
-compiler.cfg.linear-scan.ranges compiler.utilities fry kernel
-linked-assocs locals math namespaces sequences ;
+compiler.cfg.linear-scan.ranges compiler.utilities kernel
+linked-assocs math namespaces sequences ;
 IN: compiler.cfg.linear-scan.allocation.spilling
 
 : trim-before-ranges ( live-interval -- )

diff --git a/basis/compiler/cfg/linear-scan/allocation/splitting/splitting.factor b/basis/compiler/cfg/linear-scan/allocation/splitting/splitting.factor
index 56fb0f73852a1c907a96e87a24b2ad97ad05c504..1773328390dc7af9d319b7940d6bf766335cdb42 100644 (file)
--- a/basis/compiler/cfg/linear-scan/allocation/splitting/splitting.factor
+++ b/basis/compiler/cfg/linear-scan/allocation/splitting/splitting.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors binary-search combinators
-compiler.cfg.linear-scan.allocation.state
+USING: accessors compiler.cfg.linear-scan.allocation.state
 compiler.cfg.linear-scan.live-intervals
-compiler.cfg.linear-scan.ranges fry hints kernel locals math math.order
-namespaces sequences ;
+compiler.cfg.linear-scan.ranges hints kernel math namespaces
+sequences ;
 IN: compiler.cfg.linear-scan.allocation.splitting
 
 : split-uses ( uses n -- before after )

diff --git a/basis/compiler/cfg/linear-scan/allocation/state/state.factor b/basis/compiler/cfg/linear-scan/allocation/state/state.factor
index a28954fc094f047f784f15258f408d8a9a67a8eb..191cfbdf7db695b2a5724973abe4b1f2c274e03d 100644 (file)
--- a/basis/compiler/cfg/linear-scan/allocation/state/state.factor
+++ b/basis/compiler/cfg/linear-scan/allocation/state/state.factor
@@ -2,8 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators compiler.cfg
 compiler.cfg.instructions compiler.cfg.linear-scan.live-intervals
-compiler.cfg.linear-scan.ranges compiler.cfg.registers cpu.architecture fry
-heaps kernel math math.order namespaces sequences ;
+compiler.cfg.linear-scan.ranges compiler.cfg.registers
+cpu.architecture heaps kernel math math.order namespaces
+sequences ;
 IN: compiler.cfg.linear-scan.allocation.state
 
 SYMBOL: progress

diff --git a/basis/compiler/cfg/linear-scan/assignment/assignment.factor b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
index 37fb24b2d482dbc5783bc0b551b310010cc59065..ee93caf7b8a362e71c3d61c459945defca9ea04d 100644 (file)
--- a/basis/compiler/cfg/linear-scan/assignment/assignment.factor
+++ b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
@@ -2,11 +2,11 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators compiler.cfg
 compiler.cfg.instructions compiler.cfg.linear-scan.allocation.state
-compiler.cfg.linear-scan.live-intervals compiler.cfg.linearization
-compiler.cfg.liveness compiler.cfg.registers
-compiler.cfg.renaming.functor compiler.cfg.ssa.destruction.leaders
-compiler.cfg.utilities fry heaps kernel make math namespaces sequences
-;
+compiler.cfg.linear-scan.live-intervals
+compiler.cfg.linearization compiler.cfg.liveness
+compiler.cfg.registers compiler.cfg.renaming.functor
+compiler.cfg.ssa.destruction.leaders compiler.cfg.utilities
+heaps kernel make math namespaces sequences ;
 IN: compiler.cfg.linear-scan.assignment
 QUALIFIED: sets
 

diff --git a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
index ead47fbcc89b79612d5a05d5d365795042ea3f23..e8183bd93a213cdcdb244c1a62d6057c37007ad5 100644 (file)
--- a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
+++ b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs binary-search combinators compiler.cfg.def-use
-compiler.cfg.instructions compiler.cfg.linear-scan.ranges
-compiler.cfg.linearization compiler.cfg.liveness
-compiler.cfg.registers compiler.cfg.ssa.destruction.leaders
-cpu.architecture fry kernel locals math math.order namespaces
-sequences vectors ;
+USING: accessors assocs binary-search combinators
+compiler.cfg.def-use compiler.cfg.instructions
+compiler.cfg.linear-scan.ranges compiler.cfg.linearization
+compiler.cfg.liveness compiler.cfg.registers
+compiler.cfg.ssa.destruction.leaders cpu.architecture kernel
+math math.order namespaces sequences vectors ;
 IN: compiler.cfg.linear-scan.live-intervals
 
 TUPLE: vreg-use n def-rep use-rep spill-slot? ;

diff --git a/basis/compiler/cfg/linear-scan/ranges/ranges.factor b/basis/compiler/cfg/linear-scan/ranges/ranges.factor
index 43a62e465d6cbde774636db11baca22279f729da..6d51e6ef5878181b2b826b3c6d727233f6dd0be3 100644 (file)
--- a/basis/compiler/cfg/linear-scan/ranges/ranges.factor
+++ b/basis/compiler/cfg/linear-scan/ranges/ranges.factor
@@ -1,4 +1,4 @@
-USING: accessors arrays fry grouping kernel math math.order sequences ;
+USING: arrays grouping kernel math math.order sequences ;
 IN: compiler.cfg.linear-scan.ranges
 
 ! Range utilities

diff --git a/basis/compiler/cfg/linear-scan/resolve/resolve.factor b/basis/compiler/cfg/linear-scan/resolve/resolve.factor
index 2bc101a50a106e0cf9d9886ef0b1377d9e5c1bc9..29f23feef37759bfe74e73181d076043478ee1ca 100644 (file)
--- a/basis/compiler/cfg/linear-scan/resolve/resolve.factor
+++ b/basis/compiler/cfg/linear-scan/resolve/resolve.factor
@@ -5,8 +5,8 @@ combinators.short-circuit compiler.cfg compiler.cfg.instructions
 compiler.cfg.linear-scan.allocation.state
 compiler.cfg.linear-scan.assignment compiler.cfg.parallel-copy
 compiler.cfg.predecessors compiler.cfg.registers
-compiler.cfg.rpo compiler.cfg.utilities cpu.architecture fry
-kernel locals make namespaces sequences ;
+compiler.cfg.rpo compiler.cfg.utilities cpu.architecture kernel
+make namespaces sequences ;
 IN: compiler.cfg.linear-scan.resolve
 
 TUPLE: location

diff --git a/basis/compiler/cfg/linearization/linearization.factor b/basis/compiler/cfg/linearization/linearization.factor
index c1e29450a06aa0080faeaf909af047e44d9d0d7c..616942e47ec6adb8b90eff2cf46e9a4a1914c65e 100644 (file)
--- a/basis/compiler/cfg/linearization/linearization.factor
+++ b/basis/compiler/cfg/linearization/linearization.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators combinators.short-circuit
+USING: accessors combinators combinators.short-circuit
 compiler.cfg.loop-detection compiler.cfg.predecessors
-compiler.cfg.rpo compiler.cfg.utilities deques dlists fry kernel
+compiler.cfg.rpo compiler.cfg.utilities deques dlists kernel
 make math namespaces sequences sets sorting ;
 IN: compiler.cfg.linearization
 

diff --git a/basis/compiler/cfg/liveness/liveness.factor b/basis/compiler/cfg/liveness/liveness.factor
index e6009e0b42686fd1b11c8ab2f50748e06e977fb2..1bf418283c7ea88422e313aacc60088410584a36 100644 (file)
--- a/basis/compiler/cfg/liveness/liveness.factor
+++ b/basis/compiler/cfg/liveness/liveness.factor
@@ -5,7 +5,7 @@ compiler.cfg.def-use compiler.cfg.instructions
 compiler.cfg.predecessors compiler.cfg.registers
 compiler.cfg.rpo compiler.cfg.ssa.destruction.leaders
 compiler.cfg.utilities compiler.utilities cpu.architecture
-deques dlists fry kernel locals namespaces sequences sets ;
+deques dlists kernel namespaces sequences sets ;
 IN: compiler.cfg.liveness
 
 SYMBOL: live-ins

diff --git a/basis/compiler/cfg/loop-detection/loop-detection.factor b/basis/compiler/cfg/loop-detection/loop-detection.factor
index 672c0b24f2ca135f9d2ba0191dbf5940d56963a5..ba3147cadbcbf1b9cc1035834259baf3d8220658 100644 (file)
--- a/basis/compiler/cfg/loop-detection/loop-detection.factor
+++ b/basis/compiler/cfg/loop-detection/loop-detection.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators.short-circuit compiler.cfg
-compiler.cfg.predecessors compiler.cfg.utilities deques dlists fry kernel
-namespaces sequences sets ;
+compiler.cfg.predecessors compiler.cfg.utilities deques dlists
+kernel namespaces sequences sets ;
 IN: compiler.cfg.loop-detection
 
 TUPLE: natural-loop header index ends blocks ;

diff --git a/basis/compiler/cfg/parallel-copy/parallel-copy.factor b/basis/compiler/cfg/parallel-copy/parallel-copy.factor
index 696f532e783cd7d6939011f67aaf01540abd16d0..5cf448b52aaa7e631d72f34ffe576ae90eb19e18 100644 (file)
--- a/basis/compiler/cfg/parallel-copy/parallel-copy.factor
+++ b/basis/compiler/cfg/parallel-copy/parallel-copy.factor
@@ -2,8 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs compiler.cfg.instructions compiler.cfg.registers
 compiler.cfg.ssa.destruction.leaders compiler.utilities
-cpu.architecture deques dlists fry kernel locals make namespaces
-sequences ;
+cpu.architecture deques dlists kernel make namespaces sequences ;
 IN: compiler.cfg.parallel-copy
 
 <PRIVATE

diff --git a/basis/compiler/cfg/predecessors/predecessors.factor b/basis/compiler/cfg/predecessors/predecessors.factor
index 9f44a496e006faa04ea7ccee0e45774f270f9f41..f1bf80036740303a519c127421f6afa5de93a336 100644 (file)
--- a/basis/compiler/cfg/predecessors/predecessors.factor
+++ b/basis/compiler/cfg/predecessors/predecessors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs compiler.cfg.rpo compiler.cfg.utilities
-fry kernel sequences ;
+kernel sequences ;
 IN: compiler.cfg.predecessors
 
 <PRIVATE

diff --git a/basis/compiler/cfg/representations/coalescing/coalescing.factor b/basis/compiler/cfg/representations/coalescing/coalescing.factor
index 3639c570c9a77e9b487b8c75be4e634fc8513678..2893101ff6e4c66cde8026940da9eaf1a8e75821 100644 (file)
--- a/basis/compiler/cfg/representations/coalescing/coalescing.factor
+++ b/basis/compiler/cfg/representations/coalescing/coalescing.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs compiler.cfg.def-use
-compiler.cfg.instructions compiler.cfg.rpo disjoint-sets fry
-kernel namespaces sequences ;
+compiler.cfg.instructions compiler.cfg.rpo disjoint-sets kernel
+namespaces sequences ;
 IN: compiler.cfg.representations.coalescing
 
 ! Find all strongly connected components in the graph where the

diff --git a/basis/compiler/cfg/representations/conversion/conversion.factor b/basis/compiler/cfg/representations/conversion/conversion.factor
index e01a030495b907e8105a547831417aad01bae95a..6acf751a0f4d1ca0461ce6e9950cb25327bcaf03 100644 (file)
--- a/basis/compiler/cfg/representations/conversion/conversion.factor
+++ b/basis/compiler/cfg/representations/conversion/conversion.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays byte-arrays combinators compiler.cfg.instructions
 compiler.cfg.registers compiler.constants cpu.architecture
-kernel layouts locals math namespaces ;
+kernel layouts math namespaces ;
 IN: compiler.cfg.representations.conversion
 
 ERROR: bad-conversion dst src dst-rep src-rep ;

diff --git a/basis/compiler/cfg/representations/peephole/peephole.factor b/basis/compiler/cfg/representations/peephole/peephole.factor
index 692c4dd742fc7c5b95686a8516716d7e6e439251..71c46b864c152bbc464740ffa1e81dd7b6586ffa 100644 (file)
--- a/basis/compiler/cfg/representations/peephole/peephole.factor
+++ b/basis/compiler/cfg/representations/peephole/peephole.factor
@@ -4,7 +4,7 @@ USING: accessors byte-arrays combinators
 combinators.short-circuit compiler.cfg.instructions
 compiler.cfg.registers compiler.cfg.representations.rewrite
 compiler.cfg.representations.selection cpu.architecture kernel
-layouts locals make math namespaces sequences ;
+layouts make math namespaces sequences ;
 IN: compiler.cfg.representations.peephole
 
 GENERIC: optimize-insn ( insn -- )

diff --git a/basis/compiler/cfg/representations/preferred/preferred.factor b/basis/compiler/cfg/representations/preferred/preferred.factor
index 2a8805edee1e4de7a1188de6bc7134f566f05fdc..0e7fc8380d6bc09aef3c100f0d9f3a6aaa0c5499 100644 (file)
--- a/basis/compiler/cfg/representations/preferred/preferred.factor
+++ b/basis/compiler/cfg/representations/preferred/preferred.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators compiler.cfg.def-use
-compiler.cfg.instructions compiler.units cpu.architecture fry
+compiler.cfg.instructions compiler.units cpu.architecture
 generic kernel namespaces sequences sequences.generalizations
 sets words ;
 FROM: compiler.cfg.instructions.syntax => insn-def-slots

diff --git a/basis/compiler/cfg/representations/rewrite/rewrite.factor b/basis/compiler/cfg/representations/rewrite/rewrite.factor
index 6f6c858d9c682a374ee95d14ab64b81602990fd8..d1beb7dcac9e500fa417edc268c2e72644ce7ffa 100644 (file)
--- a/basis/compiler/cfg/representations/rewrite/rewrite.factor
+++ b/basis/compiler/cfg/representations/rewrite/rewrite.factor
@@ -4,7 +4,7 @@ USING: arrays assocs compiler.cfg.instructions
 compiler.cfg.registers compiler.cfg.renaming.functor
 compiler.cfg.representations.conversion
 compiler.cfg.representations.preferred compiler.cfg.rpo kernel
-locals make namespaces sequences ;
+make namespaces sequences ;
 IN: compiler.cfg.representations.rewrite
 
 ! Insert conversions. This introduces new temporaries, so we need

diff --git a/basis/compiler/cfg/rpo/rpo.factor b/basis/compiler/cfg/rpo/rpo.factor
index 2c3435daa005d738aa98f1bcc90cb7a67885825c..51ed4dd3628e528c06d1fb9fa72ba71909e27ed2 100644 (file)
--- a/basis/compiler/cfg/rpo/rpo.factor
+++ b/basis/compiler/cfg/rpo/rpo.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors compiler.cfg fry kernel make namespaces
-sequences sets ;
+USING: accessors compiler.cfg kernel make namespaces sequences
+sets ;
 IN: compiler.cfg.rpo
 
 : post-order-traversal ( visited bb -- visited )

diff --git a/basis/compiler/cfg/save-contexts/save-contexts.factor b/basis/compiler/cfg/save-contexts/save-contexts.factor
index 19f43bfc1183b65800184807ae134f0deead8cd0..af442d91f813102eca15aa54b64edefe20634cc0 100644 (file)
--- a/basis/compiler/cfg/save-contexts/save-contexts.factor
+++ b/basis/compiler/cfg/save-contexts/save-contexts.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: compiler.cfg.instructions compiler.cfg.registers compiler.cfg.rpo
-cpu.architecture kernel sequences ;
+USING: compiler.cfg.instructions compiler.cfg.registers
+compiler.cfg.rpo cpu.architecture kernel sequences ;
 IN: compiler.cfg.save-contexts
 
 UNION: context-modifier ##phi ##inc ##callback-inputs ;

diff --git a/basis/compiler/cfg/stacks/clearing/clearing.factor b/basis/compiler/cfg/stacks/clearing/clearing.factor
index 205c4f618fad07f59fd53ec5cc9dff868a0b4006..ed1bd1a272b2603ab7eb020e2f682e2d77c5bffc 100644 (file)
--- a/basis/compiler/cfg/stacks/clearing/clearing.factor
+++ b/basis/compiler/cfg/stacks/clearing/clearing.factor
@@ -1,6 +1,7 @@
 USING: accessors assocs combinators.short-circuit
-compiler.cfg.instructions compiler.cfg.registers compiler.cfg.rpo
-compiler.cfg.stacks compiler.cfg.stacks.padding kernel sequences ;
+compiler.cfg.instructions compiler.cfg.registers
+compiler.cfg.rpo compiler.cfg.stacks compiler.cfg.stacks.padding
+kernel sequences ;
 IN: compiler.cfg.stacks.clearing
 
 : state>clears ( state -- clears )

diff --git a/basis/compiler/cfg/stacks/finalize/finalize.factor b/basis/compiler/cfg/stacks/finalize/finalize.factor
index e6ce142efaf258fa35baf81d51a04f73765cf56b..4635b0e516fe015a2814cd20290cbe4da31d85bd 100644 (file)
--- a/basis/compiler/cfg/stacks/finalize/finalize.factor
+++ b/basis/compiler/cfg/stacks/finalize/finalize.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors compiler.cfg compiler.cfg.instructions
-compiler.cfg.registers compiler.cfg.rpo compiler.cfg.stacks.global
-compiler.cfg.stacks.local compiler.cfg.utilities fry kernel locals
-make math sequences sets ;
+compiler.cfg.rpo compiler.cfg.stacks.global
+compiler.cfg.stacks.local compiler.cfg.utilities kernel make
+math sequences sets ;
 IN: compiler.cfg.stacks.finalize
 
 :: inserting-peeks ( from to -- set )

diff --git a/basis/compiler/cfg/stacks/global/global.factor b/basis/compiler/cfg/stacks/global/global.factor
index e13ed3103765003c4dc38184150721b7aedc7294..36b24c8ba125f84764634f918ef973c07df22ee0 100644 (file)
--- a/basis/compiler/cfg/stacks/global/global.factor
+++ b/basis/compiler/cfg/stacks/global/global.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors compiler.cfg.dataflow-analysis kernel sequences sets ;
+USING: accessors compiler.cfg.dataflow-analysis kernel sets ;
 IN: compiler.cfg.stacks.global
 
 : transfer-peeked-locs ( set bb -- set' )

diff --git a/basis/compiler/cfg/stacks/local/local.factor b/basis/compiler/cfg/stacks/local/local.factor
index ce9b1b2e5c3052a761cd868f184aec8e3199759e..906fc9d7c547a032cdfb8b9c96963609e371f3ba 100644 (file)
--- a/basis/compiler/cfg/stacks/local/local.factor
+++ b/basis/compiler/cfg/stacks/local/local.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators compiler.cfg.instructions
-compiler.cfg.parallel-copy compiler.cfg.registers fry hash-sets kernel
-make math math.order namespaces sequences sets ;
+USING: accessors arrays assocs combinators
+compiler.cfg.instructions compiler.cfg.parallel-copy
+compiler.cfg.registers hash-sets kernel make math math.order
+namespaces sequences sets ;
 IN: compiler.cfg.stacks.local
 
 TUPLE: height-state ds-begin rs-begin ds-inc rs-inc ;

diff --git a/basis/compiler/cfg/stacks/padding/padding.factor b/basis/compiler/cfg/stacks/padding/padding.factor
index 9b1a0f92921488b1b509a56ec28b11d22a978f4a..54b672a579dbdd5caf2252b1b863ee0614cf83d4 100644 (file)
--- a/basis/compiler/cfg/stacks/padding/padding.factor
+++ b/basis/compiler/cfg/stacks/padding/padding.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs compiler.cfg.dataflow-analysis
 compiler.cfg.instructions compiler.cfg.linearization
-compiler.cfg.stacks.local fry kernel math math.order namespaces
+compiler.cfg.stacks.local kernel math math.order namespaces
 sequences ;
 QUALIFIED: sets
 IN: compiler.cfg.stacks.padding

diff --git a/basis/compiler/cfg/tco/tco.factor b/basis/compiler/cfg/tco/tco.factor
index 0d5a3e2b1eb9ceb13b91fcf5fd666e997994fded..67b290901de430c786f5cca9753ca9815afd36ea 100644 (file)
--- a/basis/compiler/cfg/tco/tco.factor
+++ b/basis/compiler/cfg/tco/tco.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators combinators.short-circuit
 compiler.cfg compiler.cfg.instructions compiler.cfg.rpo
-compiler.cfg.utilities compiler.utilities fry kernel math
-namespaces sequences ;
+compiler.cfg.utilities compiler.utilities kernel math namespaces
+sequences ;
 IN: compiler.cfg.tco
 
 ! Tail call optimization.

diff --git a/basis/compiler/cfg/utilities/utilities.factor b/basis/compiler/cfg/utilities/utilities.factor
index 8bbf4086507fc4aaa45d65f285ff07c2283272e4..7b2eb174026cdfc01b8292844b27e1e5ff5ad1c3 100644 (file)
--- a/basis/compiler/cfg/utilities/utilities.factor
+++ b/basis/compiler/cfg/utilities/utilities.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators.short-circuit
-compiler.cfg compiler.cfg.instructions compiler.cfg.rpo
-cpu.architecture deques fry hashtables heaps kernel locals
-macros math sequences sets ;
+USING: accessors arrays combinators.short-circuit compiler.cfg
+compiler.cfg.instructions compiler.cfg.rpo cpu.architecture
+deques heaps kernel math sequences sets ;
 IN: compiler.cfg.utilities
 
 : block>cfg ( bb -- cfg )

diff --git a/basis/compiler/cfg/value-numbering/alien/alien.factor b/basis/compiler/cfg/value-numbering/alien/alien.factor
index dfb0676e3c36da619206b17050f88d6d34696b68..51c1e7279603ad960dac3224b660b339dc7652eb 100644 (file)
--- a/basis/compiler/cfg/value-numbering/alien/alien.factor
+++ b/basis/compiler/cfg/value-numbering/alien/alien.factor
@@ -4,7 +4,7 @@ USING: accessors combinators combinators.short-circuit
 compiler.cfg.hats compiler.cfg.instructions
 compiler.cfg.utilities compiler.cfg.value-numbering.graph
 compiler.cfg.value-numbering.math
-compiler.cfg.value-numbering.rewrite cpu.architecture fry kernel
+compiler.cfg.value-numbering.rewrite cpu.architecture kernel
 make math sequences ;
 IN: compiler.cfg.value-numbering.alien
 

diff --git a/basis/compiler/codegen/codegen.factor b/basis/compiler/codegen/codegen.factor
index 247898a9b54a3b8bfc3fdd6b94d08053e069d83f..00c05d5c387a2b2e3056d45fc310e7f3526c8ee9 100644 (file)
--- a/basis/compiler/codegen/codegen.factor
+++ b/basis/compiler/codegen/codegen.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2008, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs byte-arrays combinators compiler.cfg
-compiler.cfg.comparisons compiler.cfg.instructions
+USING: accessors arrays assocs byte-arrays combinators
+compiler.cfg compiler.cfg.comparisons compiler.cfg.instructions
 compiler.cfg.linearization compiler.codegen.gc-maps
-compiler.codegen.labels compiler.codegen.relocation compiler.constants
-cpu.architecture fry generic.parser kernel layouts locals make math
-namespaces parser quotations sequences sequences.generalizations slots
-words ;
+compiler.codegen.labels compiler.codegen.relocation
+compiler.constants cpu.architecture generic.parser kernel
+layouts make math namespaces parser quotations sequences
+sequences.generalizations slots words ;
 IN: compiler.codegen
 
 GENERIC: generate-insn ( insn -- )

diff --git a/basis/compiler/codegen/gc-maps/gc-maps.factor b/basis/compiler/codegen/gc-maps/gc-maps.factor
index 61e9076a6677c988116246646cc3232a5f9ca90f..796ab71b3ccc199e896f201f728173b9512516bc 100644 (file)
--- a/basis/compiler/codegen/gc-maps/gc-maps.factor
+++ b/basis/compiler/codegen/gc-maps/gc-maps.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs bit-arrays classes.tuple
-compiler.codegen.relocation cpu.architecture fry kernel layouts make math
-math.order namespaces sequences ;
+compiler.codegen.relocation cpu.architecture kernel layouts make
+math namespaces sequences ;
 IN: compiler.codegen.gc-maps
 
 SYMBOLS: return-addresses gc-maps ;

diff --git a/basis/compiler/codegen/relocation/relocation.factor b/basis/compiler/codegen/relocation/relocation.factor
index 1e4bc832d305b009a414d040e4e101fd78076007..a1cc29d48aa10c765e6b7c68fb2b146336689730 100644 (file)
--- a/basis/compiler/codegen/relocation/relocation.factor
+++ b/basis/compiler/codegen/relocation/relocation.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.accessors alien.strings
-compiler.constants kernel make math math.bitwise memoize
-namespaces sequences ;
+compiler.constants kernel make math math.bitwise namespaces
+sequences ;
 IN: compiler.codegen.relocation
 
 SYMBOL: extra-offset  ! Only used by non-optimizing compiler

diff --git a/basis/compiler/crossref/crossref.factor b/basis/compiler/crossref/crossref.factor
index 516e57ad4f5ac0592b709cef987c9f5a7a82db60..8dad45dae4cd952b4a3f341ae7e8a5b8e14ed4eb 100644 (file)
--- a/basis/compiler/crossref/crossref.factor
+++ b/basis/compiler/crossref/crossref.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs combinators compiler.units fry grouping kernel
+USING: assocs combinators compiler.units grouping kernel
 namespaces sequences sets stack-checker.dependencies words ;
 IN: compiler.crossref
 

diff --git a/basis/concurrency/combinators/combinators.factor b/basis/concurrency/combinators/combinators.factor
index c0be95b2774ed3ca0066fb2df25a1af96bcb983e..2ae8538b6a9f6a41f42fe29858aefc2c99d5bbe6 100644 (file)
--- a/basis/concurrency/combinators/combinators.factor
+++ b/basis/concurrency/combinators/combinators.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays assocs combinators concurrency.count-downs
-concurrency.futures fry generalizations kernel macros sequences
+concurrency.futures generalizations kernel sequences
 sequences.private sequences.product ;
 IN: concurrency.combinators
 

diff --git a/basis/concurrency/conditions/conditions.factor b/basis/concurrency/conditions/conditions.factor
index f41303d4edb6d37235d787e04e6b7ced95c5bbef..f55892d8fc364562e0c51b53db3d23de89a90633 100644 (file)
--- a/basis/concurrency/conditions/conditions.factor
+++ b/basis/concurrency/conditions/conditions.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: deques threads kernel arrays sequences timers fry ;
+USING: deques kernel threads timers ;
 IN: concurrency.conditions
 
 : notify-1 ( deque -- )

diff --git a/basis/concurrency/count-downs/count-downs.factor b/basis/concurrency/count-downs/count-downs.factor
index c5d1d57985dce08e3fb85849de5bafe6fdee3e64..7f961ae4ce511bfe07e3815eec9dd119e43b11f7 100644 (file)
--- a/basis/concurrency/count-downs/count-downs.factor
+++ b/basis/concurrency/count-downs/count-downs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: dlists kernel math concurrency.promises
-concurrency.mailboxes accessors fry ;
+USING: accessors concurrency.mailboxes concurrency.promises
+kernel math ;
 IN: concurrency.count-downs
 
 ! http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/CountDownLatch.html

diff --git a/basis/concurrency/distributed/distributed.factor b/basis/concurrency/distributed/distributed.factor
index d859691bfdb76096271ea6007139c1175fd5918c..8f3524697df518b1c88eeb22f3dfd66c418dc272 100644 (file)
--- a/basis/concurrency/distributed/distributed.factor
+++ b/basis/concurrency/distributed/distributed.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2005 Chris Double. All Rights Reserved.
 ! Copyright (C) 2018 Alexander Ilin.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs concurrency.messaging
-continuations destructors fry init io io.encodings.binary
-io.servers io.sockets io.streams.duplex kernel namespaces
-sequences serialize threads ;
+USING: accessors arrays assocs continuations destructors init io
+io.encodings.binary io.servers io.sockets io.streams.duplex
+kernel namespaces sequences serialize threads ;
 FROM: concurrency.messaging => send ;
 IN: concurrency.distributed
 

diff --git a/basis/concurrency/exchangers/exchangers.factor b/basis/concurrency/exchangers/exchangers.factor
index bdc3a9ca80616d15e4afcdc71079d0110462fc2a..b7c9f070534584e19abd59b6431b51f858284dc1 100644 (file)
--- a/basis/concurrency/exchangers/exchangers.factor
+++ b/basis/concurrency/exchangers/exchangers.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel threads boxes accessors fry ;
+USING: accessors boxes kernel threads ;
 IN: concurrency.exchangers
 
 ! Motivated by

diff --git a/basis/concurrency/flags/flags.factor b/basis/concurrency/flags/flags.factor
index c65171a3f00b2d8c1c28c7d8ea6ccfcf8cbd240e..5f36a19e4db5fbe839964e29332e7cc3ac9fa3e4 100644 (file)
--- a/basis/concurrency/flags/flags.factor
+++ b/basis/concurrency/flags/flags.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: dlists kernel threads concurrency.conditions accessors ;
+USING: accessors concurrency.conditions dlists kernel ;
 IN: concurrency.flags
 
 TUPLE: flag value threads ;

diff --git a/basis/concurrency/futures/futures.factor b/basis/concurrency/futures/futures.factor
index c8c2f582b9be0ed108aa84b6dc329d414fde13ce..c1fbcef8560170f8c77f04a7178045b2655c7103 100644 (file)
--- a/basis/concurrency/futures/futures.factor
+++ b/basis/concurrency/futures/futures.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Chris Double, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: concurrency.promises concurrency.mailboxes kernel arrays
-continuations accessors fry ;
+USING: accessors concurrency.mailboxes concurrency.promises
+kernel ;
 IN: concurrency.futures
 
 : future ( quot -- future )

diff --git a/basis/concurrency/locks/locks.factor b/basis/concurrency/locks/locks.factor
index 69c6c8b4f8cc73f40a3c18b460dd297a00321d1a..dac71788252db22dfed7cf85e5c7469c5f63c584 100644 (file)
--- a/basis/concurrency/locks/locks.factor
+++ b/basis/concurrency/locks/locks.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: deques dlists kernel threads continuations math
-concurrency.conditions combinators.short-circuit accessors
-locals ;
+USING: accessors combinators.short-circuit
+concurrency.conditions continuations deques dlists kernel math
+threads ;
 IN: concurrency.locks
 
 ! Simple critical sections

diff --git a/basis/concurrency/mailboxes/debugger/debugger.factor b/basis/concurrency/mailboxes/debugger/debugger.factor
index c222ab0a1682b3d0d9b67702c01294367d3f5850..0e27ad4995d4c90ba2ea3249d549c5820c6ae554 100644 (file)
--- a/basis/concurrency/mailboxes/debugger/debugger.factor
+++ b/basis/concurrency/mailboxes/debugger/debugger.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: debugger accessors debugger.threads kernel
-concurrency.mailboxes ;
+USING: accessors concurrency.mailboxes debugger debugger.threads
+kernel ;
 IN: concurrency.mailboxes.debugger
 
 M: linked-error error.

diff --git a/basis/concurrency/mailboxes/mailboxes.factor b/basis/concurrency/mailboxes/mailboxes.factor
index bac28d058b3c0b1496c832f7de5ace493ebde629..546a6489afec28e892adbd2c2189b9d8148382f8 100644 (file)
--- a/basis/concurrency/mailboxes/mailboxes.factor
+++ b/basis/concurrency/mailboxes/mailboxes.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2005, 2010 Chris Double, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors concurrency.conditions continuations deques
-destructors dlists fry kernel locals sequences threads
-vocabs.loader ;
+destructors dlists kernel sequences threads vocabs.loader ;
 IN: concurrency.mailboxes
 
 TUPLE: mailbox { threads dlist } { data dlist } ;

diff --git a/basis/concurrency/messaging/messaging.factor b/basis/concurrency/messaging/messaging.factor
index 8763c83ae16b9efebc89df1c18034ae10fad84a1..eec98f9d68b51ce2b2520302f01ce2ee1541cd1b 100644 (file)
--- a/basis/concurrency/messaging/messaging.factor
+++ b/basis/concurrency/messaging/messaging.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2010 Chris Double, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel kernel.private threads concurrency.mailboxes
-continuations namespaces assocs accessors summary fry ;
+USING: accessors concurrency.mailboxes kernel kernel.private
+namespaces summary threads ;
 IN: concurrency.messaging
 
 GENERIC: send ( message thread -- )

diff --git a/basis/concurrency/promises/promises.factor b/basis/concurrency/promises/promises.factor
index f47ee05c75d9d765dd03cbf2405fd37235ef1563..6b1f61a25fc5f551e9a07213e203cb6fe3f299ee 100644 (file)
--- a/basis/concurrency/promises/promises.factor
+++ b/basis/concurrency/promises/promises.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2008 Chris Double, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors concurrency.mailboxes kernel continuations ;
+USING: accessors concurrency.mailboxes kernel ;
 IN: concurrency.promises
 
 TUPLE: promise mailbox ;

diff --git a/basis/concurrency/semaphores/semaphores.factor b/basis/concurrency/semaphores/semaphores.factor
index 11196b4f499933bf758e32b3ffd2b201952810ab..1473e22122ead3260a2c33aa866952e83f17b10d 100644 (file)
--- a/basis/concurrency/semaphores/semaphores.factor
+++ b/basis/concurrency/semaphores/semaphores.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: dlists kernel threads math concurrency.conditions
-continuations accessors summary locals fry ;
+USING: accessors concurrency.conditions continuations dlists
+kernel math summary ;
 IN: concurrency.semaphores
 
 TUPLE: semaphore count threads ;

diff --git a/basis/disjoint-sets/disjoint-sets.factor b/basis/disjoint-sets/disjoint-sets.factor
index 19ab933224213150d63ed667d001edd6d4f39f3c..4bd9e0c8e44d566811e0ae117c8808ce90d320b1 100644 (file)
--- a/basis/disjoint-sets/disjoint-sets.factor
+++ b/basis/disjoint-sets/disjoint-sets.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs fry hashtables kernel locals math
-sequences ;
+USING: accessors assocs hashtables kernel math sequences ;
 IN: disjoint-sets
 
 TUPLE: disjoint-set

diff --git a/basis/dlists/dlists.factor b/basis/dlists/dlists.factor
index 0965358950c6b50c887329d939b581bb2f73c691..cab11dd042047819cca875c48e03929111978920 100644 (file)
--- a/basis/dlists/dlists.factor
+++ b/basis/dlists/dlists.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2007, 2009 Mackenzie Straight, Doug Coleman,
 ! Slava Pestov, John Benediktsson.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators combinators.short-circuit deques fry
-hashtables kernel kernel.private math math.order parser search-deques
-sequences vocabs.loader ;
+USING: accessors combinators combinators.short-circuit deques
+hashtables kernel kernel.private math math.order parser
+search-deques sequences vocabs.loader ;
 IN: dlists
 
 TUPLE: dlist-link

diff --git a/basis/documents/documents.factor b/basis/documents/documents.factor
index 5908c1f9495de0b8f2b5b97410b4b10a8a22121b..8beed6324bf9170b4886706a3e9c4cc0c22e6efa 100644 (file)
--- a/basis/documents/documents.factor
+++ b/basis/documents/documents.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays fry kernel locals math math.order
-math.ranges models sequences splitting ;
+USING: accessors arrays kernel math math.order math.ranges
+models sequences splitting ;
 IN: documents
 
 : +col ( loc n -- newloc ) [ first2 ] dip + 2array ;

diff --git a/basis/documents/elements/elements.factor b/basis/documents/elements/elements.factor
index 3d6538aa36adeb2819261dc7dca2205ef4425993..284bbc3cce48eb6b67d3d681f021534b2e736c2f 100644 (file)
--- a/basis/documents/elements/elements.factor
+++ b/basis/documents/elements/elements.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators documents fry kernel math sequences
-accessors unicode combinators.short-circuit ;
+USING: accessors arrays combinators documents kernel math
+sequences unicode ;
 IN: documents.elements
 
 GENERIC: prev-elt ( loc document elt -- newloc )

diff --git a/basis/endian/endian.factor b/basis/endian/endian.factor
index 4956d341d35bd5bb47e7349a4f531ec452d58f1f..ba949b3aaa683de4e0b71fd076e5b15c764ecd00 100644 (file)
--- a/basis/endian/endian.factor
+++ b/basis/endian/endian.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.c-types alien.data namespaces io.binary fry
-kernel math grouping sequences math.bitwise ;
+USING: alien.c-types alien.data grouping io.binary kernel
+math.bitwise namespaces sequences ;
 IN: endian
 
 SINGLETONS: big-endian little-endian ;

diff --git a/basis/english/english.factor b/basis/english/english.factor
index 3ea32284d6dbb0bea70383b0ef78dc137dfe3c72..2d70d0ff41651f1444e8d84ee0cd46649643b127 100644 (file)
--- a/basis/english/english.factor
+++ b/basis/english/english.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2015, 2018 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors arrays assocs combinators help.markup kernel
-literals locals math math.order math.parser sequences splitting
-unicode words ;
+literals math math.order math.parser sequences splitting unicode
+words ;
 IN: english
 
 <PRIVATE

diff --git a/basis/eval/eval.factor b/basis/eval/eval.factor
index 66b783958f76804cf75e2bd125eb2e305584f7b3..a2166cfa4cebca8c7a7e599246afc458cc81d278 100644 (file)
--- a/basis/eval/eval.factor
+++ b/basis/eval/eval.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: splitting parser parser.notes compiler.units kernel
-namespaces debugger io.streams.string fry combinators
-effects.parser continuations ;
+USING: combinators compiler.units continuations debugger
+effects.parser io.streams.string kernel namespaces parser
+parser.notes splitting ;
 IN: eval
 
 : parse-string ( str -- quot )

diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor
index c2b37fec61156f1a8d1afc0a76174f9b5194bc61..5b539a6b8c68608675b055a8f30be0db1f006212 100644 (file)
--- a/basis/formatting/formatting.factor
+++ b/basis/formatting/formatting.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2008 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-USING: accessors arrays assocs calendar calendar.english combinators
-combinators.smart fry generalizations io io.streams.string
-kernel macros math math.functions math.parser namespaces
+USING: accessors arrays assocs calendar calendar.english
+combinators combinators.smart generalizations io
+io.streams.string kernel math math.functions
+math.functions.integer-logs math.parser multiline namespaces
 peg.ebnf present prettyprint quotations sequences
-sequences.generalizations strings unicode vectors
-math.functions.integer-logs splitting multiline ;
+sequences.generalizations splitting strings unicode ;
 FROM: math.parser.private => format-float ;
 IN: formatting
 

diff --git a/basis/game/input/input.factor b/basis/game/input/input.factor
index f36bc212e314a4db9a61d7d2a6e48d7a24f2d209..204de8b9d755159c9b5934f046170e472b278750 100644 (file)
--- 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 combinators ;
+USING: accessors combinators continuations init kernel math
+namespaces sequences system vocabs ;
 IN: game.input
 
 SYMBOLS: game-input-backend game-input-opened ;

diff --git a/basis/gobject-introspection/ffi/ffi.factor b/basis/gobject-introspection/ffi/ffi.factor
index 1683be9fb22b15f3e3acd0160acb723a91f50549..f348628aba582d51a2b825cf25d5ab556bf5c5ab 100644 (file)
--- a/basis/gobject-introspection/ffi/ffi.factor
+++ b/basis/gobject-introspection/ffi/ffi.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.parser arrays ascii
-classes.parser classes.struct combinators combinators.short-circuit
-gobject-introspection.repository gobject-introspection.types kernel
-locals make math.parser namespaces parser sequences
-splitting.monotonic vocabs.parser words words.constant ;
+classes.parser classes.struct combinators
+combinators.short-circuit gobject-introspection.repository
+gobject-introspection.types kernel make math.parser namespaces
+sequences splitting.monotonic vocabs.parser words words.constant ;
 IN: gobject-introspection.ffi
 
 : def-c-type ( c-type-name base-c-type -- )

diff --git a/basis/grouping/grouping.factor b/basis/grouping/grouping.factor
index 0edcb3d80b30b3c45b2311a873eb881c9030b7cc..750c8eea1eae15341b474a3878619e31ed49b6ce 100644 (file)
--- a/basis/grouping/grouping.factor
+++ b/basis/grouping/grouping.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2010 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators fry kernel math math.order
-sequences sequences.private ;
+USING: accessors kernel math math.order sequences
+sequences.private ;
 IN: grouping
 
 ERROR: groups-error seq n ;

diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor
index cf19aeb35bebc686a6ab108daa6b0f235c285199..ef1f57db00f81f91d50accef94a3910b5b82fc94 100644 (file)
--- a/basis/io/files/info/unix/unix.factor
+++ b/basis/io/files/info/unix/unix.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types alien.data arrays calendar
-calendar.unix classes.struct combinators
-combinators.short-circuit io.backend io.files.info
-io.files.types kernel libc literals math math.bitwise
+USING: accessors alien.data arrays calendar calendar.unix
+classes.struct combinators combinators.short-circuit io.backend
+io.files.info io.files.types kernel libc math math.bitwise
 sequences specialized-arrays strings system unix unix.ffi
 unix.groups unix.stat unix.time unix.users vocabs ;
 IN: io.files.info.unix

diff --git a/basis/logging/logging.factor b/basis/logging/logging.factor
index 4c9d97102b3e8d2edebffb28d56a650761e8e4a5..62cd2f82b32cf5ba0f99abb93da6453754c01102 100644 (file)
--- a/basis/logging/logging.factor
+++ b/basis/logging/logging.factor
@@ -143,7 +143,5 @@ SYNTAX: LOG:
     '[ 1array stack>message _ _ log-message ]
     ( message -- ) define-declared ;
 
-USE: vocabs
-
 "logging.parser" require
 "logging.analysis" require

diff --git a/basis/threads/threads.factor b/basis/threads/threads.factor
index 586c2cf220241ee4140333ce8a4556127f353a55..c48a69ed87fab8a5444c2de9eda8760c1eba7dca 100644 (file)
--- a/basis/threads/threads.factor
+++ b/basis/threads/threads.factor
@@ -2,7 +2,7 @@
 ! Copyright (C) 2005 Mackenzie Straight.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.private arrays assocs boxes combinators
-continuations continuations.private deques dlists fry hashtables
+continuations continuations.private deques dlists hashtables
 heaps init kernel kernel.private math math.order namespaces
 quotations sequences strings system ;
 IN: threads

diff --git a/basis/tools/files/unix/unix.factor b/basis/tools/files/unix/unix.factor
index fdc55c864d90df29e1823d22cee5e43d0a96fc22..a2a5622d80eaab8b74bfc73b3868f383aa25f2f3 100644 (file)
--- a/basis/tools/files/unix/unix.factor
+++ b/basis/tools/files/unix/unix.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators kernel system unicode io.files
-io.files.info io.files.info.unix generalizations
-strings arrays sequences math.parser unix.groups unix.users
-tools.files.private unix.stat math fry macros combinators.smart
-io tools.files math.order prettyprint ;
+USING: accessors arrays combinators combinators.smart
+io.files.info.unix kernel math math.order math.parser sequences
+strings system tools.files tools.files.private unicode
+unix.groups unix.stat unix.users ;
 IN: tools.files.unix
 
 <PRIVATE

diff --git a/basis/unix/groups/groups.factor b/basis/unix/groups/groups.factor
index be37a97c10645b4465fa6b9b21a02d6e8c2c2ca9..d214ebef833aac70a4953e9e1865c1e394bd7ae6 100644 (file)
--- a/basis/unix/groups/groups.factor
+++ b/basis/unix/groups/groups.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.data assocs byte-arrays
-classes.struct combinators continuations fry grouping
+classes.struct combinators continuations grouping
 io.encodings.utf8 kernel math math.parser namespaces sequences
 strings unix unix.ffi unix.users unix.utilities ;
 IN: unix.groups

diff --git a/basis/unix/users/users.factor b/basis/unix/users/users.factor
index d5253d0a506c024a985180520da6732cfac35ad1..8b81c25c268e9594d02e5def491675a225b4161a 100644 (file)
--- a/basis/unix/users/users.factor
+++ b/basis/unix/users/users.factor
@@ -1,10 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-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 ;
+USING: accessors assocs combinators continuations kernel math
+math.parser namespaces sequences strings system unix unix.ffi
+vocabs ;
 QUALIFIED: unix.ffi
 IN: unix.users
 

diff --git a/basis/vocabs/cache/cache.factor b/basis/vocabs/cache/cache.factor
index e1ff37984be2ecc216f8f03fedde3b9f5e22de65..873f7a541bfafca54981b324acda06e49558a9f4 100644 (file)
--- a/basis/vocabs/cache/cache.factor
+++ b/basis/vocabs/cache/cache.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs fry kernel namespaces memoize init sequences vocabs
+USING: assocs init kernel memoize namespaces sequences vocabs
 vocabs.hierarchy vocabs.loader vocabs.metadata vocabs.refresh
 words ;
 IN: vocabs.cache

diff --git a/basis/vocabs/metadata/resources/resources.factor b/basis/vocabs/metadata/resources/resources.factor
index 354b893acb4c4699436602abb34ba4f0100ab878..28de80524a0d8730aeeadd491ff1592bac3d2003 100644 (file)
--- a/basis/vocabs/metadata/resources/resources.factor
+++ b/basis/vocabs/metadata/resources/resources.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry globs io.directories io.directories.hierarchy io.files.info
-io.pathnames kernel regexp sequences sets vocabs.loader
-vocabs.metadata ;
+USING: globs io.directories io.directories.hierarchy
+io.files.info io.pathnames kernel regexp sequences sets
+vocabs.loader vocabs.metadata ;
 IN: vocabs.metadata.resources
 
 <PRIVATE

diff --git a/core/combinators/combinators.factor b/core/combinators/combinators.factor
index 917dd784533df07837c432e5bdeb84bcb509e440..d973d22530d130b1e993cf4bddaa27876d313dd1 100644 (file)
--- a/core/combinators/combinators.factor
+++ b/core/combinators/combinators.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2010 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs kernel kernel.private make math
+USING: accessors arrays assocs kernel kernel.private math
 math.order math.private quotations sequences sequences.private
 sets sorting words ;
 IN: combinators

diff --git a/core/hash-sets/hash-sets.factor b/core/hash-sets/hash-sets.factor
index 00b72ff75f32c312e327e9aa5dacabd76767cd59..a5276658a12f790850b18029a423d1aefa655fdc 100644 (file)
--- a/core/hash-sets/hash-sets.factor
+++ b/core/hash-sets/hash-sets.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2010 Daniel Ehrenberg
 ! Copyright (C) 2005, 2011 John Benediktsson, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators growable.private hash-sets
-hashtables.private kernel kernel.private math math.private
-sequences sequences.private sets sets.private slots.private
-vectors ;
+USING: accessors arrays growable.private hashtables.private
+kernel kernel.private math math.private sequences
+sequences.private sets sets.private slots.private vectors ;
 IN: hash-sets
 
 TUPLE: hash-set