extra: fix namespacing

modern-harvey2
Doug Coleman 2018-02-10 12:54:25 -06:00
parent 1b5afce9f8
commit a19c2b0c33
7 changed files with 22 additions and 21 deletions

View File

@ -114,7 +114,7 @@ PRIVATE>
! Help support ! Help support
: fuel-get-article ( name -- result ) : fuel-get-article ( name -- result )
fuel.help:get-article ; fuel.help::get-article ;
: fuel-get-article-title ( name -- result ) : fuel-get-article-title ( name -- result )
articles get at [ article-title ] [ f ] if* ; articles get at [ article-title ] [ f ] if* ;
@ -123,13 +123,13 @@ PRIVATE>
: fuel-word-def ( name -- result ) word-def ; : fuel-word-def ( name -- result ) word-def ;
: fuel-vocab-help ( name -- result ) fuel.help:vocab-help ; : fuel-vocab-help ( name -- result ) fuel.help::vocab-help ;
: fuel-word-synopsis ( word -- synopsis ) : fuel-word-synopsis ( word -- synopsis )
word-synopsis ; word-synopsis ;
: fuel-vocab-summary ( name -- summary ) : fuel-vocab-summary ( name -- summary )
fuel.help:vocab-summary ; fuel.help::vocab-summary ;
: fuel-index ( quot -- result ) : fuel-index ( quot -- result )
call( -- seq ) format-index ; call( -- seq ) format-index ;

View File

@ -182,7 +182,7 @@ ERROR: bad-filter n ;
bit-depth :> depth! bit-depth :> depth!
#components width * :> count! #components width * :> count!
#components bit-depth * width * 8 math:align 8 /i :> stride #components bit-depth * width * 8 math::align 8 /i :> stride
height [ height [
stride 1 + byte-reader stream-read stride 1 + byte-reader stream-read
@ -195,10 +195,10 @@ ERROR: bad-filter n ;
count 2 * count! count 2 * count!
] when ] when
bs:<msb0-bit-reader> :> br bs::<msb0-bit-reader> :> br
height [ height [
count [ depth br bs:read ] B{ } replicate-as count [ depth br bs::read ] B{ } replicate-as
8 br bs:align 8 br bs::align
] replicate concat ; ] replicate concat ;
:: reverse-interlace-none ( bytes loading-png -- array ) :: reverse-interlace-none ( bytes loading-png -- array )

View File

@ -1,7 +1,8 @@
! Copyright (C) 2009 Bruno Deferrari ! Copyright (C) 2009 Bruno Deferrari
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs concurrency.mailboxes io irc.client.chats USING: accessors assocs concurrency.mailboxes io
irc.messages kernel namespaces sequences strings words.symbol ; irc.client.chats irc.messages kernel namespaces sequences
strings words.symbol ;
IN: irc.client.base IN: irc.client.base
SYMBOL: current-irc-client SYMBOL: current-irc-client
@ -17,7 +18,7 @@ SYMBOL: current-irc-client
\ current-irc-client swap with-variable ; inline \ current-irc-client swap with-variable ; inline
UNION: to-target privmsg notice ; UNION: to-target privmsg notice ;
UNION: to-channel irc.messages: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 ; topic rpl-names rpl-names-end ;
UNION: to-one-chat to-target to-channel mode ; UNION: to-one-chat to-target to-channel mode ;
UNION: to-many-chats nick quit ; UNION: to-many-chats nick quit ;

View File

@ -1,9 +1,10 @@
! Copyright (C) 2009 Bruno Deferrari ! Copyright (C) 2009 Bruno Deferrari
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs arrays concurrency.mailboxes continuations destructors USING: accessors arrays assocs combinators concurrency.mailboxes
hashtables io irc.client.base irc.client.chats irc.messages kernel namespaces continuations destructors fry hashtables io irc.client.base
strings words.symbol irc.messages.base irc.client.participants fry threads irc.client.chats irc.client.participants irc.messages
combinators irc.messages.parser math sequences ; irc.messages.base irc.messages.parser kernel math namespaces
sequences strings threads words.symbol ;
IN: irc.client.internals IN: irc.client.internals
: do-connect ( server port quot: ( host port -- stream ) attempts -- stream/f ) : do-connect ( server port quot: ( host port -- stream ) attempts -- stream/f )
@ -75,7 +76,7 @@ GENERIC: process-message ( irc-message -- )
M: object process-message drop ; M: object process-message drop ;
M: ping process-message trailing>> /PONG ; M: ping process-message trailing>> /PONG ;
! FIXME: it shouldn't be checking for the presence of chat here... ! FIXME: it shouldn't be checking for the presence of chat here...
M: irc.messages:join M: irc.messages::join
process-message [ sender>> ] [ chat> ] bi process-message [ sender>> ] [ chat> ] bi
[ join-participant ] [ drop ] if* ; [ join-participant ] [ drop ] if* ;
M: part process-message [ sender>> ] [ chat> ] bi [ part-participant ] [ drop ] if* ; M: part process-message [ sender>> ] [ chat> ] bi [ part-participant ] [ drop ] if* ;

View File

@ -1,7 +1,7 @@
! Copyright (C) 2009 Bruno Deferrari. ! Copyright (C) 2009 Bruno Deferrari.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors irc.messages irc.messages.base kernel make USING: accessors combinators irc.messages irc.messages.base
combinators sequences ; kernel make sequences ;
IN: irc.logbot.log-line IN: irc.logbot.log-line
: dot-or-parens ( string -- string ) : dot-or-parens ( string -- string )
@ -23,7 +23,7 @@ M: privmsg >log-line
: prefix% ( string -- ) : prefix% ( string -- )
" [" % % "]" % ; " [" % % "]" % ;
M: irc.messages:join >log-line M: irc.messages::join >log-line
[ [
[ "* " % sender>> % ] [ "* " % sender>> % ]
[ prefix>> prefix% " has joined the channel." % ] bi [ prefix>> prefix% " has joined the channel." % ] bi

View File

@ -3,7 +3,7 @@
USING: accessors alien.c-types grouping kernel locals math USING: accessors alien.c-types grouping kernel locals math
math.order math.ranges math.vectors math.vectors.homogeneous math.order math.ranges math.vectors math.vectors.homogeneous
sequences specialized-arrays ; sequences specialized-arrays ;
SPECIALIZED-ARRAY: alien.c-types:float SPECIALIZED-ARRAY: alien.c-types::float
IN: nurbs IN: nurbs
TUPLE: nurbs-curve TUPLE: nurbs-curve

View File

@ -6,7 +6,6 @@ math math.order math.ranges namespaces pdf.canvas pdf.values
pdf.wrap sequences sequences.extras sorting splitting ui.text pdf.wrap sequences sequences.extras sorting splitting ui.text
xml.entities ; xml.entities ;
FROM: pdf.canvas => draw-text ; FROM: pdf.canvas => draw-text ;
IN: pdf.layout IN: pdf.layout
! TODO: inset, image ! TODO: inset, image
@ -251,7 +250,7 @@ M: table-row pdf-render
] each widths >alist sort-keys values ] each widths >alist sort-keys values
! make last cell larger ! make last cell larger
dup sum 400 swap [-] [ + ] curry dupd sequences.extras:change-last dup sum 400 swap [-] [ + ] curry dupd sequences.extras::change-last
! size down each column ! size down each column
dup sum dup 400 > [ 400 swap / [ * ] curry map ] [ drop ] if ; dup sum dup 400 > [ 400 swap / [ * ] curry map ] [ drop ] if ;