From a19c2b0c3334df84c5e3d3a41ad92819bc3c5373 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 10 Feb 2018 12:54:25 -0600 Subject: [PATCH] extra: fix namespacing --- extra/fuel/fuel.factor | 6 +++--- extra/images/png/png.factor | 8 ++++---- extra/irc/client/base/base.factor | 7 ++++--- extra/irc/client/internals/internals.factor | 11 ++++++----- extra/irc/logbot/log-line/log-line.factor | 6 +++--- extra/nurbs/nurbs.factor | 2 +- extra/pdf/layout/layout.factor | 3 +-- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor index 585c5f46ef..d4a253f52c 100644 --- a/extra/fuel/fuel.factor +++ b/extra/fuel/fuel.factor @@ -114,7 +114,7 @@ PRIVATE> ! Help support : fuel-get-article ( name -- result ) - fuel.help:get-article ; + fuel.help::get-article ; : fuel-get-article-title ( name -- result ) articles get at [ article-title ] [ f ] if* ; @@ -123,13 +123,13 @@ PRIVATE> : 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 ) word-synopsis ; : fuel-vocab-summary ( name -- summary ) - fuel.help:vocab-summary ; + fuel.help::vocab-summary ; : fuel-index ( quot -- result ) call( -- seq ) format-index ; diff --git a/extra/images/png/png.factor b/extra/images/png/png.factor index d1d46dad3d..695530c9df 100644 --- a/extra/images/png/png.factor +++ b/extra/images/png/png.factor @@ -182,7 +182,7 @@ ERROR: bad-filter n ; bit-depth :> depth! #components width * :> count! - #components bit-depth * width * 8 math:align 8 /i :> stride + #components bit-depth * width * 8 math::align 8 /i :> stride height [ stride 1 + byte-reader stream-read @@ -195,10 +195,10 @@ ERROR: bad-filter n ; count 2 * count! ] when - bs: :> br + bs:: :> br height [ - count [ depth br bs:read ] B{ } replicate-as - 8 br bs:align + count [ depth br bs::read ] B{ } replicate-as + 8 br bs::align ] replicate concat ; :: reverse-interlace-none ( bytes loading-png -- array ) diff --git a/extra/irc/client/base/base.factor b/extra/irc/client/base/base.factor index cdb03fbaef..d9aba06148 100644 --- a/extra/irc/client/base/base.factor +++ b/extra/irc/client/base/base.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2009 Bruno Deferrari ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs concurrency.mailboxes io irc.client.chats -irc.messages kernel namespaces sequences strings words.symbol ; +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 @@ -17,7 +18,7 @@ SYMBOL: current-irc-client \ current-irc-client swap with-variable ; inline 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 ; UNION: to-one-chat to-target to-channel mode ; UNION: to-many-chats nick quit ; diff --git a/extra/irc/client/internals/internals.factor b/extra/irc/client/internals/internals.factor index 2cf2975a93..3aa566cc57 100644 --- a/extra/irc/client/internals/internals.factor +++ b/extra/irc/client/internals/internals.factor @@ -1,9 +1,10 @@ ! Copyright (C) 2009 Bruno Deferrari ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs arrays concurrency.mailboxes continuations destructors -hashtables io irc.client.base irc.client.chats irc.messages kernel namespaces -strings words.symbol irc.messages.base irc.client.participants fry threads -combinators irc.messages.parser math sequences ; +USING: accessors arrays assocs combinators concurrency.mailboxes +continuations destructors fry hashtables io irc.client.base +irc.client.chats irc.client.participants irc.messages +irc.messages.base irc.messages.parser kernel math namespaces +sequences strings threads words.symbol ; IN: irc.client.internals : 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: ping process-message trailing>> /PONG ; ! 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 [ join-participant ] [ drop ] if* ; M: part process-message [ sender>> ] [ chat> ] bi [ part-participant ] [ drop ] if* ; diff --git a/extra/irc/logbot/log-line/log-line.factor b/extra/irc/logbot/log-line/log-line.factor index a6a52131ad..de7921db75 100644 --- a/extra/irc/logbot/log-line/log-line.factor +++ b/extra/irc/logbot/log-line/log-line.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Bruno Deferrari. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors irc.messages irc.messages.base kernel make -combinators sequences ; +USING: accessors combinators irc.messages irc.messages.base +kernel make sequences ; IN: irc.logbot.log-line : dot-or-parens ( string -- string ) @@ -23,7 +23,7 @@ M: privmsg >log-line : prefix% ( string -- ) " [" % % "]" % ; -M: irc.messages:join >log-line +M: irc.messages::join >log-line [ [ "* " % sender>> % ] [ prefix>> prefix% " has joined the channel." % ] bi diff --git a/extra/nurbs/nurbs.factor b/extra/nurbs/nurbs.factor index cc938ff205..7c63a0f1a5 100644 --- a/extra/nurbs/nurbs.factor +++ b/extra/nurbs/nurbs.factor @@ -3,7 +3,7 @@ USING: accessors alien.c-types grouping kernel locals math math.order math.ranges math.vectors math.vectors.homogeneous sequences specialized-arrays ; -SPECIALIZED-ARRAY: alien.c-types:float +SPECIALIZED-ARRAY: alien.c-types::float IN: nurbs TUPLE: nurbs-curve diff --git a/extra/pdf/layout/layout.factor b/extra/pdf/layout/layout.factor index f7741fbd6b..32e3d2d4a3 100644 --- a/extra/pdf/layout/layout.factor +++ b/extra/pdf/layout/layout.factor @@ -6,7 +6,6 @@ math math.order math.ranges namespaces pdf.canvas pdf.values pdf.wrap sequences sequences.extras sorting splitting ui.text xml.entities ; FROM: pdf.canvas => draw-text ; - IN: pdf.layout ! TODO: inset, image @@ -251,7 +250,7 @@ M: table-row pdf-render ] each widths >alist sort-keys values ! 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 dup sum dup 400 > [ 400 swap / [ * ] curry map ] [ drop ] if ;