From f2a8a79a1a159d3599aef07f934072cd43b45795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Sat, 24 Jun 2017 16:38:34 +0200 Subject: [PATCH] basis/,extra/: removing some unnecessary EXCLUDE declarations --- basis/io/sockets/unix/unix.factor | 11 +++++----- basis/ui/gadgets/editors/editors.factor | 27 +++++++++++------------- basis/x11/xinput2/ffi/ffi.factor | 3 +-- extra/irc/client/base/base.factor | 7 +++--- extra/irc/messages/messages-tests.factor | 4 +--- extra/irc/messages/messages.factor | 3 +-- 6 files changed, 23 insertions(+), 32 deletions(-) diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor index 35881c9e58..0617c5ed1f 100644 --- 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 ] 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 39710d3c46..7243a5ebc6 100644 --- 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 ; 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 2f06fd6cfb..cdb03fbaef 100644 --- 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 347bdd00fa..14e53b281e 100644 --- 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 d53ef6924b..ba27dd8396 100644 --- 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