basis/,extra/: removing some unnecessary EXCLUDE declarations

diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor
index 35881c9e58c33bce0520b69482f34fa0d44d3110..0617c5ed1fa87eed9d5f195a9a42bc581ff18870 100644 (file)
--- a/basis/io/sockets/unix/unix.factor
+++ b/basis/io/sockets/unix/unix.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2004, 2008 Slava Pestov, Ivan Tikhonov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data alien.strings
-arrays byte-arrays classes.struct combinators destructors
-io.backend.unix io.encodings.ascii io.encodings.utf8 io.files
-io.pathnames io.sockets.private kernel libc locals math
-namespaces sequences system unix unix.ffi vocabs ;
-EXCLUDE: io.sockets => accept ;
+byte-arrays classes.struct combinators destructors io.backend.unix
+io.encodings.ascii io.encodings.utf8 io.files io.pathnames io.sockets
+io.sockets.private kernel libc locals math namespaces sequences system
+unix unix.ffi vocabs ;
 IN: io.sockets.unix
 
 : socket-fd ( domain type protocol -- fd )
@@ -95,7 +94,7 @@ M: object (server)
 
 : do-accept ( server addrspec -- fd sockaddr )
     [ handle>> handle-fd ] [ empty-sockaddr/size int <ref> ] bi*
-    [ accept ] 2keep drop ; inline
+    [ unix.ffi:accept ] 2keep drop ; inline
 
 M: object (accept)
     2dup do-accept over 0 >= [

diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index 39710d3c46c27de4c0de5a2b60a475fc88229975..7243a5ebc600372fb3979608164c8f23899da586 100644 (file)
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -1,22 +1,19 @@
 ! Copyright (C) 2006, 2011 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs calendar colors.constants
-combinators combinators.short-circuit documents
-documents.elements fry grouping kernel locals make math
-math.functions math.order math.ranges math.rectangles
-math.vectors models models.arrow namespaces opengl sequences
-sorting splitting timers ui.baseline-alignment ui.clipboards
-ui.commands ui.gadgets ui.gadgets.borders
-ui.gadgets.line-support ui.gadgets.menus ui.gadgets.scrollers
-ui.theme ui.gestures ui.pens.solid ui.render ui.text
-unicode ;
-EXCLUDE: fonts => selection ;
+USING: accessors arrays assocs calendar colors.constants combinators
+combinators.short-circuit documents documents.elements fonts fry
+grouping kernel locals make math math.functions math.order math.ranges
+math.rectangles math.vectors models models.arrow namespaces opengl
+sequences sorting splitting timers ui.baseline-alignment ui.clipboards
+ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.line-support
+ui.gadgets.menus ui.gadgets.scrollers ui.gestures ui.pens.solid
+ui.render ui.text ui.theme unicode ;
 IN: ui.gadgets.editors
 
 TUPLE: editor < line-gadget
-caret-color
-caret mark
-focused? blink blink-timer ;
+    caret-color
+    caret mark
+    focused? blink blink-timer ;
 
 <PRIVATE
 
@@ -384,7 +381,7 @@ editor "editing" f {
 
 : com-paste ( editor -- ) clipboard get paste-clipboard ;
 
-: paste-selection ( editor -- ) selection get paste-clipboard ;
+: paste-selection ( editor -- ) ui.clipboards:selection get paste-clipboard ;
 
 : com-cut ( editor -- ) clipboard get editor-cut ;
 

diff --git a/basis/x11/xinput2/ffi/ffi.factor b/basis/x11/xinput2/ffi/ffi.factor
index d625879e6ce8fb39db5bd7b7344a8a361ebf9965..0c62ab0145f260af76e714008c1438474b720db8 100644 (file)
--- a/basis/x11/xinput2/ffi/ffi.factor
+++ b/basis/x11/xinput2/ffi/ffi.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2010 Niklas Waern.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries alien.syntax classes.struct
-locals sequences x11.X x11.syntax x11.xlib ;
-EXCLUDE: math => float ;
+locals math sequences x11.X x11.syntax x11.xlib ;
 IN: x11.xinput2.ffi
 
 << "xinput2" "libXi.so" cdecl add-library >>

diff --git a/extra/irc/client/base/base.factor b/extra/irc/client/base/base.factor
index 2f06fd6cfb503b1201dfe8b53e49b94eed91fa19..cdb03fbaef7223c82df2887d8c7493a92409a8cf 100644 (file)
--- a/extra/irc/client/base/base.factor
+++ b/extra/irc/client/base/base.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2009 Bruno Deferrari
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs concurrency.mailboxes io kernel namespaces
-strings words.symbol irc.client.chats irc.messages ;
-EXCLUDE: sequences => join ;
+USING: accessors assocs concurrency.mailboxes io irc.client.chats
+irc.messages kernel namespaces sequences strings words.symbol ;
 IN: irc.client.base
 
 SYMBOL: current-irc-client
@@ -18,7 +17,7 @@ SYMBOL: current-irc-client
     \ current-irc-client swap with-variable ; inline
 
 UNION: to-target privmsg notice ;
-UNION: to-channel join part topic kick rpl-channel-modes
+UNION: to-channel irc.messages:join part topic kick rpl-channel-modes
                   topic rpl-names rpl-names-end ;
 UNION: to-one-chat to-target to-channel mode ;
 UNION: to-many-chats nick quit ;

diff --git a/extra/irc/messages/messages-tests.factor b/extra/irc/messages/messages-tests.factor
index 347bdd00fa4d7a05781305d2e2692259bb1df3f2..14e53b281e729fcba1a56f03e7381b76d7298b2b 100644 (file)
--- a/extra/irc/messages/messages-tests.factor
+++ b/extra/irc/messages/messages-tests.factor
@@ -1,8 +1,6 @@
 ! Copyright (C) 2009 Bruno Deferrari
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel tools.test accessors arrays
-       irc.messages.parser irc.messages ;
-EXCLUDE: sequences => join ;
+USING: accessors irc.messages irc.messages.parser tools.test ;
 IN: irc.messages.tests
 
 

diff --git a/extra/irc/messages/messages.factor b/extra/irc/messages/messages.factor
index d53ef6924b6a0518dff95bf1fd3ea05e89158ea3..ba27dd83969332e59e9eace2b6246e84b69522f6 100644 (file)
--- a/extra/irc/messages/messages.factor
+++ b/extra/irc/messages/messages.factor
@@ -2,8 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel fry splitting ascii calendar accessors combinators
 arrays classes.tuple math.order words assocs strings irc.messages.base
-combinators.short-circuit math ;
-EXCLUDE: sequences => join ;
+combinators.short-circuit math sequences ;
 IN: irc.messages
 
 ! connection