factor: more using trim

diff --git a/basis/furnace/syndication/syndication-docs.factor b/basis/furnace/syndication/syndication-docs.factor
index a587e8d68b4b263454aca066b9ba72392e7b47d5..714b0cef0ff78e9465adea5c902ea3d01e209f46 100644 (file)
--- a/basis/furnace/syndication/syndication-docs.factor
+++ b/basis/furnace/syndication/syndication-docs.factor
@@ -1,4 +1,5 @@
-USING: help.markup help.syntax io.streams.string kernel sequences strings urls syndication calendar ;
+USING: calendar help.markup help.syntax kernel strings
+syndication urls ;
 IN: furnace.syndication
 
 HELP: <feed-action>

diff --git a/basis/game/input/x11/x11.factor b/basis/game/input/x11/x11.factor
index eb1273ed80605bab8e3abf1c10b33f02e3a7d948..fcaf8202eed1e8a1356ed729340fe68439f0d46c 100644 (file)
--- a/basis/game/input/x11/x11.factor
+++ b/basis/game/input/x11/x11.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2010 Erik Charlebois, William Schlieper.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types alien.data arrays kernel game.input
-namespaces math classes bit-arrays system sequences vectors
-x11 x11.xlib assocs generalizations ;
+USING: accessors alien.c-types alien.data assocs bit-arrays
+game.input kernel math namespaces sequences system x11 x11.xlib ;
 IN: game.input.x11
 
 SINGLETON: x11-game-input-backend

diff --git a/basis/http/server/dispatchers/dispatchers-docs.factor b/basis/http/server/dispatchers/dispatchers-docs.factor
index b13774753d2bca0f09d9f374d16d62aae7734d92..583edee8ee101dc49f394d64ac89f730ad81b350 100644 (file)
--- a/basis/http/server/dispatchers/dispatchers-docs.factor
+++ b/basis/http/server/dispatchers/dispatchers-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: classes help.markup help.syntax io.streams.string ;
+USING: classes help.markup help.syntax ;
 IN: http.server.dispatchers
 
 HELP: new-dispatcher

diff --git a/basis/persistent/hashtables/nodes/bitmap/bitmap.factor b/basis/persistent/hashtables/nodes/bitmap/bitmap.factor
index 38e16fe6b41027ada009a64cc9c9f0bcb173a094..8586bd42d20774dab96c2adb95032c231d667020 100644 (file)
--- a/basis/persistent/hashtables/nodes/bitmap/bitmap.factor
+++ b/basis/persistent/hashtables/nodes/bitmap/bitmap.factor
@@ -1,10 +1,8 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
-USING: math math.bitwise arrays kernel accessors locals sequences
-sequences.private
-persistent.sequences
-persistent.hashtables.config
-persistent.hashtables.nodes ;
+USING: accessors kernel math math.bitwise
+persistent.hashtables.config persistent.hashtables.nodes
+persistent.sequences sequences sequences.private ;
 IN: persistent.hashtables.nodes.bitmap
 
 : index ( bit bitmap -- n ) [ 1 - ] dip bitand bit-count ; inline

diff --git a/basis/persistent/hashtables/nodes/collision/collision.factor b/basis/persistent/hashtables/nodes/collision/collision.factor
index 3d1612862a3b46d9d0059bceeafef770048f1538..4e9446e2e074e22bad31906ade643c2abdc0b7ae 100644 (file)
--- a/basis/persistent/hashtables/nodes/collision/collision.factor
+++ b/basis/persistent/hashtables/nodes/collision/collision.factor
@@ -1,10 +1,7 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
-USING: kernel accessors math arrays fry sequences
-locals persistent.sequences
-persistent.hashtables.config
-persistent.hashtables.nodes
-persistent.hashtables.nodes.leaf ;
+USING: accessors kernel persistent.hashtables.nodes
+persistent.hashtables.nodes.leaf persistent.sequences sequences ;
 IN: persistent.hashtables.nodes.collision
 
 : find-index ( key hashcode collision-node -- n leaf-node )

diff --git a/basis/persistent/hashtables/nodes/empty/empty.factor b/basis/persistent/hashtables/nodes/empty/empty.factor
index 95a310acd9d461481b7bde00429b38400e806bc4..a020684c35092ada6f742e91632a63658f31a56c 100644 (file)
--- a/basis/persistent/hashtables/nodes/empty/empty.factor
+++ b/basis/persistent/hashtables/nodes/empty/empty.factor
@@ -1,6 +1,6 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
-USING: accessors kernel locals persistent.hashtables.nodes ;
+USING: accessors kernel persistent.hashtables.nodes ;
 IN: persistent.hashtables.nodes.empty
 
 M: empty-node (entry-at) 3drop f ;

diff --git a/basis/persistent/hashtables/nodes/full/full.factor b/basis/persistent/hashtables/nodes/full/full.factor
index 5a9cc2506d2fe79e6fc1e92c00d13f710c347866..7e4bda7e9dd89f1dac684b5ee7d4e7d7c9ad1f0a 100644 (file)
--- a/basis/persistent/hashtables/nodes/full/full.factor
+++ b/basis/persistent/hashtables/nodes/full/full.factor
@@ -1,10 +1,8 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
-USING: math accessors kernel arrays sequences sequences.private
-locals
-persistent.sequences
-persistent.hashtables.config
-persistent.hashtables.nodes ;
+USING: accessors kernel math persistent.hashtables.config
+persistent.hashtables.nodes persistent.sequences sequences
+sequences.private ;
 IN: persistent.hashtables.nodes.full
 
 M:: full-node (new-at) ( shift value key hashcode full-node -- node' added-leaf )

diff --git a/basis/persistent/hashtables/nodes/leaf/leaf.factor b/basis/persistent/hashtables/nodes/leaf/leaf.factor
index 0a15ea6305f11ff4969ec6c2f8f9d0cd17953ed3..79e3f66d703d04268097ee35af0a043acdec3a9c 100644 (file)
--- a/basis/persistent/hashtables/nodes/leaf/leaf.factor
+++ b/basis/persistent/hashtables/nodes/leaf/leaf.factor
@@ -1,8 +1,6 @@
 ! Based on Clojure's PersistentHashMap by Rich Hickey.
 
-USING: kernel accessors locals math arrays namespaces make
-persistent.hashtables.config
-persistent.hashtables.nodes ;
+USING: accessors arrays kernel make persistent.hashtables.nodes ;
 IN: persistent.hashtables.nodes.leaf
 
 : matching-key? ( key hashcode leaf-node -- ? )

diff --git a/basis/persistent/heaps/heaps.factor b/basis/persistent/heaps/heaps.factor
index 7d3905337970e5e0a86e24fc0e846d3138cb9eee..fecb399e043cb516bff765fdfa80a6cc56c410e9 100644 (file)
--- a/basis/persistent/heaps/heaps.factor
+++ b/basis/persistent/heaps/heaps.factor
@@ -1,5 +1,4 @@
-USING: kernel accessors locals combinators math arrays
-assocs namespaces sequences ;
+USING: accessors arrays assocs combinators kernel math sequences ;
 IN: persistent.heaps
 ! These are minheaps
 

diff --git a/extra/benchmark/ant/ant.factor b/extra/benchmark/ant/ant.factor
index 4542707786286c42a5dee28e0cee1d529e7ee986..e49c744da630cf62f5982acff0ea68a1db0b29b4 100644 (file)
--- a/extra/benchmark/ant/ant.factor
+++ b/extra/benchmark/ant/ant.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: accessors combinators fry hash-sets hashtables kernel
-locals math math.parser sequences sets vectors ;
+USING: accessors hash-sets kernel math sequences sets vectors ;
 
 IN: benchmark.ant
 

diff --git a/extra/benchmark/cuckoo-filters/cuckoo-filters.factor b/extra/benchmark/cuckoo-filters/cuckoo-filters.factor
index 16c668e1bf775a19b3ffdd0857f6caaa22977f43..e59ceda3b87b8dfc63cd833c2b3e8e7134cef2bd 100644 (file)
--- a/extra/benchmark/cuckoo-filters/cuckoo-filters.factor
+++ b/extra/benchmark/cuckoo-filters/cuckoo-filters.factor
@@ -1,4 +1,4 @@
-USING: cuckoo-filters endian fry kernel math sequences ;
+USING: cuckoo-filters endian kernel math sequences ;
 IN: benchmark.cuckoo-filters
 
 : insert-data ( cuckoo-filter -- cuckoo-filter )

diff --git a/extra/benchmark/memoize/memoize.factor b/extra/benchmark/memoize/memoize.factor
index f48e85ebae7aed918ca84a17f55e6e1084aa65ad..4738d3b1155dced1e61740be536d8927d39cc421 100644 (file)
--- a/extra/benchmark/memoize/memoize.factor
+++ b/extra/benchmark/memoize/memoize.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math memoize sequences ;
+USING: kernel math sequences ;
 IN: benchmark.memoize
 
 MEMO: mem0 ( -- ) ;

diff --git a/extra/benchmark/splay/splay.factor b/extra/benchmark/splay/splay.factor
index 50f27f977911dc232cd7156760abdbf6cd235354..1670314ae3fc1d1d35c3a2bf56a15802d6ce1ddd 100644 (file)
--- a/extra/benchmark/splay/splay.factor
+++ b/extra/benchmark/splay/splay.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: arrays assocs kernel ranges random sequences sets
+USING: arrays assocs kernel random sequences
 sorting trees.splay ;
 
 IN: benchmark.splay

diff --git a/extra/benchmark/stack/stack.factor b/extra/benchmark/stack/stack.factor
index d4dc18e80fb43baf4fb03d330d6b0d6ea0d39a11..6a2b5d6b01772264ccf8653b7d7a2d2a502710b7 100644 (file)
--- a/extra/benchmark/stack/stack.factor
+++ b/extra/benchmark/stack/stack.factor
@@ -1,4 +1,4 @@
-USING: kernel sequences math math.functions vectors ;
+USING: kernel sequences math vectors ;
 IN: benchmark.stack
 
 : stack-loop ( vec -- )

diff --git a/extra/benchmark/struct-arrays/struct-arrays.factor b/extra/benchmark/struct-arrays/struct-arrays.factor
index 42b1abdbd0bf97b2458cea0c8be32845c28041cb..5f272b2668a79dbb5ee23d182c159bb6d19a1104 100644 (file)
--- a/extra/benchmark/struct-arrays/struct-arrays.factor
+++ b/extra/benchmark/struct-arrays/struct-arrays.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.data classes.struct combinators.smart
-fry kernel math math.functions math.order math.parser sequences
+kernel math math.functions math.order math.parser sequences
 specialized-arrays io ;
 FROM: alien.c-types => float ;
 IN: benchmark.struct-arrays

diff --git a/extra/benchmark/typecheck2/typecheck2.factor b/extra/benchmark/typecheck2/typecheck2.factor
index 7557d7744039aaf720a8722f792ab63df5d338b6..1eeda3daf2ba885371eac38ecddfa5a75ec4eae0 100644 (file)
--- a/extra/benchmark/typecheck2/typecheck2.factor
+++ b/extra/benchmark/typecheck2/typecheck2.factor
@@ -1,4 +1,4 @@
-USING: math kernel kernel.private slots.private ;
+USING: math kernel slots.private ;
 IN: benchmark.typecheck2
 
 TUPLE: hello n ;

diff --git a/extra/benchmark/typecheck3/typecheck3.factor b/extra/benchmark/typecheck3/typecheck3.factor
index 639914d80b98542bdb6bc6e439709b54a601aa15..5992bce0e4f095528865146a22bef34a39a4dd7b 100644 (file)
--- a/extra/benchmark/typecheck3/typecheck3.factor
+++ b/extra/benchmark/typecheck3/typecheck3.factor
@@ -1,4 +1,4 @@
-USING: math kernel kernel.private slots.private ;
+USING: math kernel slots.private ;
 IN: benchmark.typecheck3
 
 TUPLE: hello n ;

diff --git a/extra/benchmark/udp-echo0/udp-echo0.factor b/extra/benchmark/udp-echo0/udp-echo0.factor
index f4fa7c242a57fdf7467560014de5c0234c14c86a..2179c3f89c5b5fa29b6075871abd1f750a714618 100644 (file)
--- a/extra/benchmark/udp-echo0/udp-echo0.factor
+++ b/extra/benchmark/udp-echo0/udp-echo0.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2011 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: accessors destructors endian fry io.sockets kernel
+USING: accessors destructors endian io.sockets kernel
 sequences ;
 
 IN: benchmark.udp-echo0

diff --git a/extra/benchmark/unicode/unicode.factor b/extra/benchmark/unicode/unicode.factor
index bb3c59649aa72894a6215114d3f669b470a027b2..d5e47fbaaf04add07761960990f8bf921a3e2467 100644 (file)
--- a/extra/benchmark/unicode/unicode.factor
+++ b/extra/benchmark/unicode/unicode.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math random sequences splitting strings unicode ;
+USING: kernel math random sequences splitting unicode ;
 IN: benchmark.unicode
 
 : crazy-unicode-string ( -- string )

diff --git a/extra/benchmark/wrap/wrap.factor b/extra/benchmark/wrap/wrap.factor
index 1971033e13f0287490f588cb5e0f49a1b0698685..3dc2c3e90ed5049147ff7e630066fb6233400832 100644 (file)
--- a/extra/benchmark/wrap/wrap.factor
+++ b/extra/benchmark/wrap/wrap.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.parser sequences splitting wrap wrap.strings ;
+USING: kernel math math.parser sequences splitting wrap.strings ;
 IN: benchmark.wrap
 
 : wrap-benchmark ( -- )

diff --git a/extra/benchmark/xml/xml.factor b/extra/benchmark/xml/xml.factor
index 0450331ddfbfc56754804c0ff6d8c5a0a700cec4..c6a4b6ec2e48aeca588cdc8be3f91393d85ec815 100644 (file)
--- a/extra/benchmark/xml/xml.factor
+++ b/extra/benchmark/xml/xml.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.encodings.utf8 io.directories io.files kernel
-sequences xml ;
+USING: io.directories kernel sequences xml ;
 IN: benchmark.xml
 
 : xml-benchmark ( -- )

diff --git a/extra/benchmark/yuv-to-rgb/yuv-to-rgb.factor b/extra/benchmark/yuv-to-rgb/yuv-to-rgb.factor
index a68a3fd37db3afa259e1efb7179e61cf6e455234..c9a324be2b8927cbb0258976933db16bcec66bca 100644 (file)
--- a/extra/benchmark/yuv-to-rgb/yuv-to-rgb.factor
+++ b/extra/benchmark/yuv-to-rgb/yuv-to-rgb.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.accessors alien.c-types alien.syntax byte-arrays
-destructors generalizations kernel libc locals math math.order
-sequences sequences.private classes.struct accessors alien.data
-typed ;
+USING: accessors alien.accessors alien.c-types alien.data
+byte-arrays classes.struct destructors generalizations kernel
+libc math math.order sequences sequences.private typed ;
 IN: benchmark.yuv-to-rgb
 
 STRUCT: yuv-buffer

diff --git a/extra/binhex/binhex.factor b/extra/binhex/binhex.factor
index 3e2aa0a1cd8f988ba030480d4fa78b553fcd824a..28bcedb8d2f936e163f96229d47a6902b7a41318 100644 (file)
--- a/extra/binhex/binhex.factor
+++ b/extra/binhex/binhex.factor
@@ -2,10 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: accessors base64.private byte-arrays combinators endian
-generalizations grouping io io.encodings.binary
-io.encodings.string io.encodings.utf8 io.files
-io.streams.byte-array kernel kernel.private literals make math
-math.bitwise sequences splitting.monotonic ;
+grouping io io.encodings.binary io.encodings.string
+io.encodings.utf8 io.files io.streams.byte-array kernel
+kernel.private literals make math math.bitwise sequences
+splitting.monotonic ;
 
 IN: binhex
 

diff --git a/extra/bitcoin/client/client.factor b/extra/bitcoin/client/client.factor
index 7f566f6fc2252d33477c3edc15165c4a14b496cc..70db9e07aa103e75e8cd072d733673c15512eed4 100644 (file)
--- a/extra/bitcoin/client/client.factor
+++ b/extra/bitcoin/client/client.factor
@@ -12,14 +12,12 @@ USING:
     assocs
     base64
     byte-arrays
-    hashtables
     http
     http.client
     io.encodings.binary
     json.reader
     json.writer
     kernel
-    locals
     namespaces
     sequences
     strings

diff --git a/extra/bittorrent/bittorrent.factor b/extra/bittorrent/bittorrent.factor
index 6c1df4bd522557a2f7d51d129035aa2a0e6c36d0..1509788e66be80368a3f30ec01be05521f575455 100644 (file)
--- a/extra/bittorrent/bittorrent.factor
+++ b/extra/bittorrent/bittorrent.factor
@@ -2,13 +2,11 @@
 ! See http://factorcode.org/license.txt for BSD license
 USING: accessors arrays assocs bencode byte-arrays byte-vectors
 calendar checksums checksums.sha combinators destructors endian
-fry grouping http.client io io.encodings.binary io.files
+grouping http.client io io.encodings.binary io.files
 io.pathnames io.sockets io.streams.byte-array io.streams.duplex
-kernel literals locals make math math.bitwise math.functions
-math.order math.parser ranges multiline namespaces
-prettyprint random sequences splitting strings timers
-tools.annotations ui ui.gadgets.panes ui.tools.listener urls
-urls.encoding ;
+kernel literals make math math.bitwise math.functions math.order
+math.parser namespaces random ranges sequences splitting strings
+timers ui ui.gadgets.panes ui.tools.listener urls ;
 
 IN: bittorrent
 

diff --git a/extra/boids/boids.factor b/extra/boids/boids.factor
index 076ecca2ded0cd0528917d30f2b2b7e19ed53b39..42190abd22defdbc1746590d73a99c3cc56c6e6e 100644 (file)
--- a/extra/boids/boids.factor
+++ b/extra/boids/boids.factor
@@ -3,13 +3,12 @@
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: accessors arrays boids.simulation calendar classes colors
-kernel literals locals math math.functions math.trig models
-namespaces opengl opengl.demo-support opengl.gl sequences
+kernel literals math math.functions math.trig models
+models.range opengl opengl.demo-support opengl.gl sequences
 threads ui ui.commands ui.gadgets ui.gadgets.borders
 ui.gadgets.buttons ui.gadgets.frames ui.gadgets.grids
 ui.gadgets.labeled ui.gadgets.labels ui.gadgets.packs
-ui.gadgets.sliders ui.gadgets.tracks ui.gadgets.worlds ui.render
-ui.tools.common ;
+ui.gadgets.sliders ui.render ui.tools.common ;
 
 QUALIFIED-WITH: models.range mr
 IN: boids

diff --git a/extra/boids/simulation/simulation.factor b/extra/boids/simulation/simulation.factor
index 1eafb76c796b0681843071532065dc6835498dcb..b2df09f8c060ddf9cbcef1be6295209df79ee222 100644 (file)
--- a/extra/boids/simulation/simulation.factor
+++ b/extra/boids/simulation/simulation.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Eduardo Cavazos.
 ! Copyright (C) 2011 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays combinators.short-circuit kernel
-locals math math.vectors random sequences ;
+USING: accessors arrays combinators.short-circuit kernel math
+math.vectors random sequences ;
 IN: boids.simulation
 
 CONSTANT: WIDTH 512

diff --git a/extra/boolean-expr/boolean-expr-docs.factor b/extra/boolean-expr/boolean-expr-docs.factor
index 35ea2bba4d24c024daadc09b0c6dcf04c2a6cb1a..79d36de8004c77dcb6544d89981c78f470339d5e 100644 (file)
--- a/extra/boolean-expr/boolean-expr-docs.factor
+++ b/extra/boolean-expr/boolean-expr-docs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2018 Alexander Ilin.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays help.markup help.syntax kernel quotations sequences ;
+USING: arrays help.markup help.syntax kernel ;
 IN: boolean-expr
 
 ABOUT: "boolean-expr"

diff --git a/extra/bubble-chamber/bubble-chamber.factor b/extra/bubble-chamber/bubble-chamber.factor
index f9f3ba8dd3ad80efe65c938a1ba8540d6f26670e..44a433e5d13c8a64d89f93cc5e860c5f2f7e614d 100644 (file)
--- a/extra/bubble-chamber/bubble-chamber.factor
+++ b/extra/bubble-chamber/bubble-chamber.factor
@@ -1,10 +1,10 @@
 USING: accessors arrays ascii calendar colors colors.gray
-combinators.short-circuit fry kernel locals math math.constants
-math.functions math.libm math.order math.points ranges
-math.vectors namespaces opengl processing.shapes quotations
-random sequences splitting timers ui ui.gadgets
-ui.gadgets.borders ui.gadgets.buttons ui.gadgets.frame-buffer
-ui.gadgets.packs ui.gestures ;
+combinators.short-circuit kernel math math.constants
+math.functions math.libm math.order math.points math.vectors
+namespaces opengl processing.shapes quotations random ranges
+sequences splitting timers ui ui.gadgets ui.gadgets.borders
+ui.gadgets.buttons ui.gadgets.frame-buffer ui.gadgets.packs
+ui.gestures ;
 
 IN: bubble-chamber
 

diff --git a/extra/c/lexer/lexer.factor b/extra/c/lexer/lexer.factor
index 77cf8d2f5893e3d4f5ce8a1daf6c94c78ac89a7f..9375388bce7bad51d35226c71910c47346115b2c 100644 (file)
--- a/extra/c/lexer/lexer.factor
+++ b/extra/c/lexer/lexer.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators combinators.short-circuit
-generalizations kernel locals math.order ranges
-sequences.parser sequences sequences.generalizations
-sorting.functor sorting.slots unicode ;
+USING: accessors combinators combinators.short-circuit kernel
+math.order ranges sequences sequences.generalizations
+sequences.parser sorting.functor sorting.slots unicode ;
 IN: c.lexer
 
 : take-c-comment ( sequence-parser -- seq/f )

diff --git a/extra/cairo-demo/cairo-demo.factor b/extra/cairo-demo/cairo-demo.factor
index 30fdb3ad731da9a1c6f1a3590566b166cba74260..e0add3589b03a84b08a2e860f5c5f88c337cd67a 100644 (file)
--- a/extra/cairo-demo/cairo-demo.factor
+++ b/extra/cairo-demo/cairo-demo.factor
@@ -6,7 +6,7 @@
 !  http://cairographics.org/samples/text/
 
 
-USING: accessors byte-arrays combinators kernel math
+USING: accessors byte-arrays cairo.ffi combinators kernel math
 math.constants opengl.gl pango.cairo.ffi ui ui.gadgets ui.render ;
 
 IN: cairo-demo
@@ -20,9 +20,6 @@ IN: cairo-demo
 
 TUPLE: cairo-demo-gadget < gadget image-array cairo-t ;
 
-USE: io
-USE: formatting
-
 M: cairo-demo-gadget draw-gadget* ( gadget -- )
     0 0 glRasterPos2i
     1.0 -1.0 glPixelZoom

diff --git a/extra/cairo-gadgets/cairo-gadgets.factor b/extra/cairo-gadgets/cairo-gadgets.factor
index 84f9c28179fb19321746a49b16b9e2bfe083702c..9678c85a9e1cf1437dd160487c66506989ec498e 100644 (file)
--- a/extra/cairo-gadgets/cairo-gadgets.factor
+++ b/extra/cairo-gadgets/cairo-gadgets.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Matthew Willis.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors cairo destructors kernel libc math namespaces
-opengl.gl pango.cairo.ffi sequences ui.gadgets ui.render ;
+USING: accessors cairo cairo.ffi destructors kernel libc math
+namespaces opengl.gl sequences ui.gadgets ui.render ;
 IN: cairo-gadgets
 
 SYMBOL: current-cairo

diff --git a/extra/cap/cap.factor b/extra/cap/cap.factor
index 3a21b4d4f29c4cce565eb534c3ad6eaa1eb654fc..7c39374e74db619927b60578927dc67aded36fba 100644 (file)
--- a/extra/cap/cap.factor
+++ b/extra/cap/cap.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors byte-arrays images images.normalization
-images.viewer kernel locals math namespaces opengl opengl.gl
+images.viewer kernel math namespaces opengl opengl.gl
 sequences ui ui.gadgets.worlds ;
 IN: cap
 

diff --git a/extra/chipmunk/ffi/ffi.factor b/extra/chipmunk/ffi/ffi.factor
index 3a224a50ab457f735f56906b829ff395ae36ce6f..231795530dc373cf97523c9765a8680f26759761 100644 (file)
--- a/extra/chipmunk/ffi/ffi.factor
+++ b/extra/chipmunk/ffi/ffi.factor
@@ -2,8 +2,7 @@
 ! See http:// factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data alien.libraries
 alien.syntax classes.struct combinators combinators.short-circuit
-kernel math math.order sequences typed specialized-arrays locals
-system ;
+kernel math math.order sequences typed specialized-arrays system ;
 SPECIALIZED-ARRAY: void*
 IN: chipmunk.ffi
 

diff --git a/extra/combinators/tuple/tuple-docs.factor b/extra/combinators/tuple/tuple-docs.factor
index 9a7fc4e6845bf978f36c747687a11aabf6d082a9..48bf780e666f2b2fb963e8d74f6caf7e552ac2a1 100644 (file)
--- a/extra/combinators/tuple/tuple-docs.factor
+++ b/extra/combinators/tuple/tuple-docs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs classes.tuple generalizations kernel
-quotations sequences ;
+USING: assocs classes help.markup help.syntax kernel math
+quotations strings ;
 IN: combinators.tuple
 
 HELP: 1make-tuple

diff --git a/extra/combinators/tuple/tuple.factor b/extra/combinators/tuple/tuple.factor
index 24e1a408bd275bc4201c22132e60d65393370c33..976589813307b178cbd9824629b62415df27c856 100644 (file)
--- a/extra/combinators/tuple/tuple.factor
+++ b/extra/combinators/tuple/tuple.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs classes.tuple generalizations kernel
-locals quotations sequences ;
+quotations sequences ;
 IN: combinators.tuple
 
 <PRIVATE

diff --git a/extra/coroutines/coroutines.factor b/extra/coroutines/coroutines.factor
index eec83525e90113bbb3bd21fa2d7aa61ead5648cc..f19235a55153670cc873c7df9f52702b88454a4c 100644 (file)
--- a/extra/coroutines/coroutines.factor
+++ b/extra/coroutines/coroutines.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2005 Chris Double, 2007 Clemens Hofreither, 2008 James Cash.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel hashtables namespaces make continuations quotations
-accessors ;
+USING: kernel hashtables namespaces make continuations accessors ;
 IN: coroutines
 
 SYMBOL: current-coro

diff --git a/extra/cuda/demos/hello-world/hello-world.factor b/extra/cuda/demos/hello-world/hello-world.factor
index 980f7ba179dab14893e8d8b28ee43ba0a495eda2..8d40090e5f4f0469f6d409cf7e89a758161c16d1 100644 (file)
--- a/extra/cuda/demos/hello-world/hello-world.factor
+++ b/extra/cuda/demos/hello-world/hello-world.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2010 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types alien.strings byte-arrays cuda
-cuda.contexts cuda.devices cuda.libraries cuda.memory cuda.syntax
-destructors io io.encodings.string io.encodings.utf8 kernel locals
-math math.parser namespaces sequences strings ;
+USING: alien.c-types cuda cuda.contexts cuda.devices
+cuda.libraries cuda.memory cuda.syntax destructors io
+io.encodings.string io.encodings.utf8 kernel math math.parser
+sequences strings ;
 IN: cuda.demos.hello-world
 
 CUDA-LIBRARY: hello cuda32 "vocab:cuda/demos/hello-world/hello.ptx"

diff --git a/extra/gpu/effects/blur/blur.factor b/extra/gpu/effects/blur/blur.factor
index b1af0f0d80d279b28b33248b1074a398a870abe1..3394be77f292c9c0a5b057788027be281a08bdee 100644 (file)
--- a/extra/gpu/effects/blur/blur.factor
+++ b/extra/gpu/effects/blur/blur.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays destructors fry gpu.framebuffers gpu.render gpu.shaders
-gpu.state gpu.textures gpu.util images kernel locals math
-math.rectangles sequences ;
+USING: destructors gpu.render gpu.shaders gpu.state gpu.textures
+gpu.util images kernel math math.rectangles sequences ;
 IN: gpu.effects.blur
 
 GLSL-SHADER: blur-fragment-shader fragment-shader

diff --git a/extra/gpu/effects/step/step.factor b/extra/gpu/effects/step/step.factor
index bd3b013b4abd98f20c38d8c7ad058ec9ea77a3fa..755342bcec677a1d2632f71a65bd1de02c98a853 100644 (file)
--- a/extra/gpu/effects/step/step.factor
+++ b/extra/gpu/effects/step/step.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: destructors gpu.render gpu.shaders gpu.state gpu.textures
-gpu.util images kernel locals math.rectangles ;
+USING: destructors gpu.render gpu.shaders gpu.state gpu.util
+images kernel math.rectangles ;
 IN: gpu.effects.step
 
 GLSL-SHADER: step-fragment-shader fragment-shader

diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor
index 3bcb08bd0672f4668a63057997e17ac6e7030318..84f9ec3617212c9b999d3db12a4b88ed4af306ee 100644 (file)
--- a/extra/gpu/render/render.factor
+++ b/extra/gpu/render/render.factor
@@ -2,10 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data arrays assocs
 classes classes.parser classes.struct classes.tuple
-classes.tuple.private combinators combinators.tuple fry generic
+classes.tuple.private combinators combinators.tuple generic
 generic.parser gpu.buffers gpu.framebuffers
 gpu.framebuffers.private gpu.shaders gpu.shaders.private
-gpu.textures gpu.textures.private kernel lexer locals math
+gpu.textures gpu.textures.private kernel lexer math
 math.parser math.vectors.simd opengl.gl parser quotations
 sequences slots sorting specialized-arrays strings variants words ;
 FROM: math => float ;

diff --git a/extra/gpu/util/util.factor b/extra/gpu/util/util.factor
index 0542051ec70adcb347f43a7d55cf079a10b4613f..01cf4a4fbc5d509e56ea65403799972a4e3c36fe 100644 (file)
--- a/extra/gpu/util/util.factor
+++ b/extra/gpu/util/util.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays destructors gpu.buffers gpu.framebuffers gpu.render
-gpu.shaders gpu.state gpu.textures images kernel locals math
+gpu.shaders gpu.state gpu.textures images kernel math
 math.rectangles opengl.gl sequences specialized-arrays ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float

diff --git a/extra/noise/noise.factor b/extra/noise/noise.factor
index 252a1368a230e8a08381fd6cfb5b23e5b1dfcffb..2b1bb88baa0ce932fa60daac684b2a17383a11db 100644 (file)
--- a/extra/noise/noise.factor
+++ b/extra/noise/noise.factor
@@ -1,8 +1,9 @@
-USING: accessors alien.data alien.data.map byte-arrays combinators combinators.short-circuit
-fry generalizations images kernel locals math math.constants math.functions
-math.libm math.matrices.simd math.vectors math.vectors.conversion math.vectors.simd
-memoize random random.mersenne-twister sequences sequences.private specialized-arrays
-typed ;
+USING: accessors alien.data alien.data.map
+byte-arrays combinators combinators.short-circuit
+generalizations images kernel math math.matrices.simd
+math.vectors math.vectors.conversion math.vectors.simd random
+random.mersenne-twister sequences sequences.private
+specialized-arrays typed ;
 QUALIFIED-WITH: alien.c-types c
 SPECIALIZED-ARRAYS: c:float c:uchar float-4 uchar-16 ;
 IN: noise

diff --git a/extra/processing/shapes/shapes.factor b/extra/processing/shapes/shapes.factor
index 098e70fca191f76c90f8a94fca1ef700f310da44..1841d752b647fceeff44620414b44e5b2061e386 100644 (file)
--- a/extra/processing/shapes/shapes.factor
+++ b/extra/processing/shapes/shapes.factor
@@ -1,8 +1,6 @@
 USING: alien.c-types alien.data arrays colors grouping kernel
-locals math math.vectors namespaces opengl opengl.demo-support
-opengl.gl opengl.glu sequences sequences.generalizations shuffle
-;
-
+math math.vectors namespaces opengl opengl.demo-support
+opengl.gl opengl.glu sequences sequences.generalizations ;
 IN: processing.shapes
 
 SYMBOL: fill-color

diff --git a/extra/terrain/generation/generation.factor b/extra/terrain/generation/generation.factor
index 5c48577efe66c37a7b04b1c2b06f643cdb84985c..ec1083fb1a3ec8b43a51603e07f40beac606efa1 100644 (file)
--- a/extra/terrain/generation/generation.factor
+++ b/extra/terrain/generation/generation.factor
@@ -1,7 +1,6 @@
-USING: accessors alien.data.map arrays byte-arrays combinators
-combinators.smart fry grouping images kernel math
-math.matrices.simd math.order math.vectors noise random
-sequences math.vectors.simd typed ;
+USING: accessors alien.data.map byte-arrays combinators grouping
+images kernel math math.matrices.simd math.order math.vectors
+math.vectors.simd noise random sequences typed ;
 FROM: alien.c-types => float uchar ;
 IN: terrain.generation
 

diff --git a/extra/trees/trees.factor b/extra/trees/trees.factor
index b43da272dd3698ec38732400637acd66712eaaa2..617024a3dd07635e05149da974beed9d17db99d0 100644 (file)
--- a/extra/trees/trees.factor
+++ b/extra/trees/trees.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators
-combinators.short-circuit deques dlists kernel locals make math
+combinators.short-circuit deques dlists kernel make math
 math.order namespaces parser prettyprint.custom random sequences
 vectors ;
 IN: trees

diff --git a/extra/ui/gadgets/frame-buffer/frame-buffer.factor b/extra/ui/gadgets/frame-buffer/frame-buffer.factor
index c66945cebdb4e202d7749bceb0a3677db65774b5..8b9d331516623779e6297fa4227dea316073e577 100644 (file)
--- a/extra/ui/gadgets/frame-buffer/frame-buffer.factor
+++ b/extra/ui/gadgets/frame-buffer/frame-buffer.factor
@@ -1,5 +1,5 @@
-USING: accessors alien.c-types alien.data combinators grouping
-kernel locals math math.vectors opengl opengl.gl sequences
+USING: accessors alien.c-types alien.data grouping kernel
+math math.vectors opengl opengl.gl sequences
 specialized-arrays ui.gadgets ui.render ;
 SPECIALIZED-ARRAY: uint
 IN: ui.gadgets.frame-buffer