From 8033741135aecfddd1229bacca4fe29290618d93 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 24 Oct 2014 17:33:27 -0700 Subject: [PATCH] io/ui: slim down the USE: list --- basis/io/backend/unix/macosx/macosx.factor | 7 ++-- .../unix/multiplexers/multiplexers.factor | 2 +- basis/io/backend/unix/unix.factor | 6 ++-- basis/io/files/unix/unix.factor | 6 ++-- basis/io/ports/ports.factor | 13 +++----- basis/io/sockets/secure/secure.factor | 6 ++-- basis/io/sockets/secure/unix/unix.factor | 12 +++---- basis/ui/backend/backend.factor | 2 +- basis/ui/backend/cocoa/views/views.factor | 12 +++---- basis/ui/event-loop/event-loop.factor | 2 +- basis/ui/tools/browser/browser.factor | 9 +++--- .../ui/tools/listener/history/history.factor | 4 +-- basis/ui/tools/listener/listener.factor | 32 +++++++++---------- 13 files changed, 52 insertions(+), 61 deletions(-) diff --git a/basis/io/backend/unix/macosx/macosx.factor b/basis/io/backend/unix/macosx/macosx.factor index 6149ce7928..1a210beddc 100644 --- a/basis/io/backend/unix/macosx/macosx.factor +++ b/basis/io/backend/unix/macosx/macosx.factor @@ -1,9 +1,8 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: io.backend system namespaces -io.backend.unix.multiplexers io.backend.unix.multiplexers.run-loop -kernel accessors assocs continuations unix io.backend.unix -io.backend.unix.multiplexers.kqueue io.files.unix init ; +USING: init io.backend io.backend.unix +io.backend.unix.multiplexers io.backend.unix.multiplexers.kqueue +io.backend.unix.multiplexers.run-loop namespaces system ; IN: io.backend.unix.macosx SINGLETON: macosx-kqueue diff --git a/basis/io/backend/unix/multiplexers/multiplexers.factor b/basis/io/backend/unix/multiplexers/multiplexers.factor index ded028dda4..2440b6a8ae 100644 --- a/basis/io/backend/unix/multiplexers/multiplexers.factor +++ b/basis/io/backend/unix/multiplexers/multiplexers.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel accessors assocs sequences threads destructors ; +USING: accessors assocs destructors kernel sequences threads ; IN: io.backend.unix.multiplexers TUPLE: mx < disposable fd reads writes ; diff --git a/basis/io/backend/unix/unix.factor b/basis/io/backend/unix/unix.factor index 64fe90f18b..43f25d077b 100755 --- a/basis/io/backend/unix/unix.factor +++ b/basis/io/backend/unix/unix.factor @@ -3,9 +3,9 @@ USING: accessors alien.c-types alien.data alien.syntax classes.struct combinators destructors destructors.private fry hints io.backend io.backend.unix.multiplexers io.buffers -io.files io.ports io.timeouts kernel kernel.private libc -literals locals make math namespaces sequences summary system -threads unix unix.ffi unix.stat unix.types ; +io.files io.ports io.timeouts kernel kernel.private libc locals +make math namespaces sequences summary system threads unix +unix.ffi unix.stat unix.types ; QUALIFIED: io IN: io.backend.unix diff --git a/basis/io/files/unix/unix.factor b/basis/io/files/unix/unix.factor index 63fbe1a1a9..108f3bd475 100644 --- a/basis/io/files/unix/unix.factor +++ b/basis/io/files/unix/unix.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2005, 2008 Slava Pestov, Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: unix byte-arrays kernel io.backend.unix math.bitwise -io.ports io.files io.files.private io.pathnames libc environment -destructors system unix.ffi literals ; +USING: byte-arrays destructors environment io.backend.unix +io.files io.files.private io.pathnames io.ports kernel libc +literals system unix unix.ffi ; IN: io.files.unix M: unix cwd ( -- path ) diff --git a/basis/io/ports/ports.factor b/basis/io/ports/ports.factor index fef806b9cb..2697ac6d80 100644 --- a/basis/io/ports/ports.factor +++ b/basis/io/ports/ports.factor @@ -1,13 +1,10 @@ ! Copyright (C) 2005, 2010 Slava Pestov, Doug Coleman ! See http://factorcode.org/license.txt for BSD license. -USING: accessors alien alien.c-types alien.data assocs -byte-arrays byte-vectors classes combinators continuations -destructors dlists fry generic grouping hints io io.backend -io.buffers io.encodings io.encodings.ascii io.encodings.binary -io.encodings.private io.encodings.utf8 io.timeouts kernel libc -locals math math.order namespaces sequences specialized-arrays -specialized-arrays.instances.alien.c-types.uchar splitting -strings summary system io.files kernel.private ; +USING: accessors alien alien.c-types alien.data byte-arrays +combinators destructors fry grouping hints io io.backend +io.buffers io.encodings io.files io.timeouts kernel +kernel.private libc locals math math.order namespaces sequences +strings system ; IN: io.ports SYMBOL: default-buffer-size diff --git a/basis/io/sockets/secure/secure.factor b/basis/io/sockets/secure/secure.factor index eba08909b4..9e6f55569e 100644 --- a/basis/io/sockets/secure/secure.factor +++ b/basis/io/sockets/secure/secure.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2008, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel namespaces continuations destructors io -debugger io.sockets io.sockets.private sequences summary -calendar delegate system vocabs combinators present ; +USING: accessors calendar combinators delegate destructors io +io.sockets io.sockets.private kernel namespaces present +sequences summary system vocabs ; IN: io.sockets.secure SYMBOL: secure-socket-timeout diff --git a/basis/io/sockets/secure/unix/unix.factor b/basis/io/sockets/secure/unix/unix.factor index 6b6ba6da8e..125e442e61 100644 --- a/basis/io/sockets/secure/unix/unix.factor +++ b/basis/io/sockets/secure/unix/unix.factor @@ -1,13 +1,9 @@ ! Copyright (C) 2007, 2011, Slava Pestov, Elie CHAFTARI. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors unix byte-arrays kernel sequences namespaces -math math.order combinators init alien alien.c-types -alien.strings libc continuations destructors openssl -openssl.libcrypto openssl.libssl io io.files io.ports -io.backend.unix io.sockets.unix io.encodings.ascii io.buffers -io.sockets io.sockets.private io.sockets.secure -io.sockets.secure.openssl io.timeouts system summary fry -unix.ffi ; +USING: accessors combinators destructors io.backend.unix +io.files io.sockets.private io.sockets.secure +io.sockets.secure.openssl io.timeouts kernel math openssl +openssl.libssl system ; FROM: io.ports => shutdown ; IN: io.sockets.secure.unix diff --git a/basis/ui/backend/backend.factor b/basis/ui/backend/backend.factor index 2cea326826..5d56003e15 100644 --- a/basis/ui/backend/backend.factor +++ b/basis/ui/backend/backend.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: command-line kernel namespaces opengl opengl.gl fry ; +USING: command-line kernel namespaces ; IN: ui.backend SYMBOL: ui-backend diff --git a/basis/ui/backend/cocoa/views/views.factor b/basis/ui/backend/cocoa/views/views.factor index 6fa3495280..949b135429 100644 --- a/basis/ui/backend/cocoa/views/views.factor +++ b/basis/ui/backend/cocoa/views/views.factor @@ -2,12 +2,12 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien alien.c-types alien.data alien.strings arrays assocs cocoa cocoa.application cocoa.classes -cocoa.messages cocoa.pasteboard cocoa.runtime cocoa.subclassing -cocoa.types cocoa.views combinators core-foundation.strings -core-graphics core-graphics.types core-text io.encodings.utf8 -kernel locals math math.rectangles namespaces opengl sequences -threads ui.gadgets ui.gadgets.private ui.gadgets.worlds -ui.gestures ui.private ; +cocoa.pasteboard cocoa.runtime cocoa.subclassing cocoa.types +cocoa.views combinators core-foundation.strings core-graphics +core-graphics.types core-text io.encodings.utf8 kernel locals +math math.rectangles namespaces opengl sequences threads +ui.gadgets ui.gadgets.private ui.gadgets.worlds ui.gestures +ui.private ; IN: ui.backend.cocoa.views : send-mouse-moved ( view event -- ) diff --git a/basis/ui/event-loop/event-loop.factor b/basis/ui/event-loop/event-loop.factor index f054d2b404..4b92aa7ad7 100644 --- a/basis/ui/event-loop/event-loop.factor +++ b/basis/ui/event-loop/event-loop.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: calendar combinators deques kernel namespaces sequences -threads ui ui.private ui.backend ui.gadgets ui.gadgets.private ; +system threads ui.backend ui.gadgets.private ; IN: ui.event-loop : event-loop? ( -- ? ) diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index 021d58e0f7..c4587bb4d6 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -1,14 +1,15 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs classes combinators +USING: accessors arrays classes combinators combinators.short-circuit compiler.units debugger fry help -help.apropos help.crossref help.home help.topics help.stylesheet +help.apropos help.crossref help.home help.stylesheet help.topics kernel models sequences sets ui ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons ui.gadgets.editors ui.gadgets.glass ui.gadgets.labels ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.tracks -ui.gadgets.viewports ui.gestures ui.tools.browser.history -ui.tools.browser.popups ui.tools.common vocabs ui.gadgets.worlds ; +ui.gadgets.viewports ui.gadgets.worlds ui.gestures +ui.tools.browser.history ui.tools.browser.popups ui.tools.common +vocabs ; IN: ui.tools.browser TUPLE: browser-gadget < tool history scroller search-field popup ; diff --git a/basis/ui/tools/listener/history/history.factor b/basis/ui/tools/listener/history/history.factor index a50cf7369c..13c3c386e2 100644 --- a/basis/ui/tools/listener/history/history.factor +++ b/basis/ui/tools/listener/history/history.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors documents kernel math math.order -sequences fry io.styles ; +USING: accessors documents fry io.styles kernel math math.order +sequences ; IN: ui.tools.listener.history TUPLE: history document elements index ; diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index ec36ff7bdb..8b01ca58e4 100644 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -1,22 +1,20 @@ ! Copyright (C) 2005, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs calendar combinators locals -source-files.errors colors.constants combinators.short-circuit -compiler.units help.tips concurrency.flags concurrency.mailboxes -continuations destructors documents documents.elements fry hashtables -help help.markup io io.styles kernel lexer listener make math models sets -models.delay models.arrow namespaces parser prettyprint quotations -sequences strings threads vocabs vocabs.refresh vocabs.loader -vocabs.parser words debugger ui ui.commands ui.pens.solid ui.gadgets -ui.gadgets.glass ui.gadgets.buttons ui.gadgets.editors -ui.gadgets.labeled ui.gadgets.panes ui.gadgets.scrollers -ui.gadgets.status-bar ui.gadgets.tracks ui.gadgets.borders ui.gestures -ui.operations ui.tools.browser ui.tools.common ui.tools.debugger -ui.tools.listener.completion ui.tools.listener.popups -ui.tools.listener.history ui.images ui.tools.error-list -tools.errors.model ; -FROM: source-files.errors => all-errors ; -FROM: namespaces => set ; +USING: accessors arrays assocs calendar colors.constants +combinators combinators.short-circuit concurrency.flags +concurrency.mailboxes continuations destructors documents +documents.elements fry hashtables help help.markup help.tips io +io.styles kernel lexer listener locals make math models +models.arrow models.delay namespaces parser prettyprint +quotations sequences source-files.errors strings threads +tools.errors.model ui ui.commands ui.gadgets ui.gadgets.buttons +ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled +ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar +ui.gadgets.tracks ui.gestures ui.operations ui.pens.solid +ui.tools.browser ui.tools.common ui.tools.debugger +ui.tools.error-list ui.tools.listener.completion +ui.tools.listener.history ui.tools.listener.popups vocabs +vocabs.loader vocabs.parser vocabs.refresh words ; IN: ui.tools.listener ! If waiting is t, we're waiting for user input, and invoking