From 3ab0d03a1901bb2874ad7a3173dd39f1ba49e237 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 3 Dec 2008 19:11:55 -0600 Subject: [PATCH] extra: swap 3append -> glue, remove some >r r> --- .../benchmark/knucleotide/knucleotide.factor | 2 +- extra/bitfields/bitfields.factor | 2 +- extra/dns/dns.factor | 2 +- extra/irc/gitbot/gitbot.factor | 2 +- extra/math/text/english/english.factor | 2 +- extra/money/money.factor | 2 +- extra/printf/printf.factor | 2 +- extra/sequences/lib/lib.factor | 26 ++++++++----------- extra/webapps/blogs/blogs.factor | 2 +- 9 files changed, 19 insertions(+), 23 deletions(-) diff --git a/extra/benchmark/knucleotide/knucleotide.factor b/extra/benchmark/knucleotide/knucleotide.factor index 6bd2d69cfa..7b8e2d34c9 100644 --- a/extra/benchmark/knucleotide/knucleotide.factor +++ b/extra/benchmark/knucleotide/knucleotide.factor @@ -9,7 +9,7 @@ IN: benchmark.knucleotide "." split1 rot over length over < [ CHAR: 0 pad-right ] - [ head ] if "." swap 3append ; + [ head ] if "." glue ; : discard-lines ( -- ) readln diff --git a/extra/bitfields/bitfields.factor b/extra/bitfields/bitfields.factor index 5eb41cd943..90e588be48 100755 --- a/extra/bitfields/bitfields.factor +++ b/extra/bitfields/bitfields.factor @@ -80,7 +80,7 @@ M: check< summary drop "Number exceeds upper bound" ; [ ":" split1 string>number [ dup length ] unless* ] { } map>assoc ; : define-slots ( prefix names quots -- ) - >r [ "-" swap 3append create-in ] with map r> + >r [ "-" glue create-in ] with map r> [ define ] 2each ; : define-accessors ( classname slots -- ) diff --git a/extra/dns/dns.factor b/extra/dns/dns.factor index 214b45ce0c..be3ba40ac0 100644 --- a/extra/dns/dns.factor +++ b/extra/dns/dns.factor @@ -285,7 +285,7 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED [ get-label ] [ skip-label get-name ] 2bi - "." swap 3append + "." glue ] } } diff --git a/extra/irc/gitbot/gitbot.factor b/extra/irc/gitbot/gitbot.factor index 93ccb2b407..3b7694a347 100644 --- a/extra/irc/gitbot/gitbot.factor +++ b/extra/irc/gitbot/gitbot.factor @@ -31,7 +31,7 @@ M: object handle-message drop ; "git-log" , "--no-merges" , "--pretty=format:%h %an: %s" , - ".." swap 3append , + ".." glue , ] { } make latin1 [ input-stream get lines ] with-process-reader ; diff --git a/extra/math/text/english/english.factor b/extra/math/text/english/english.factor index 58dab74cdb..41f19b9b07 100755 --- a/extra/math/text/english/english.factor +++ b/extra/math/text/english/english.factor @@ -56,7 +56,7 @@ SYMBOL: and-needed? : text-with-scale ( index seq -- str ) [ nth 3digits>text ] [ drop scale-numbers ] 2bi - [ " " swap 3append ] unless-empty ; + [ " " glue ] unless-empty ; : append-with-conjunction ( str1 str2 -- newstr ) over length zero? [ diff --git a/extra/money/money.factor b/extra/money/money.factor index b7da97ca06..553c473cce 100644 --- a/extra/money/money.factor +++ b/extra/money/money.factor @@ -12,7 +12,7 @@ CHAR: $ \ currency-token set-global : (money>string) ( dollars cents -- string ) [ number>string ] bi@ [ 3 group "," join ] - [ 2 CHAR: 0 pad-left ] bi* "." swap 3append ; + [ 2 CHAR: 0 pad-left ] bi* "." glue ; : money>string ( object -- string ) dollars/cents (money>string) currency-token get prefix ; diff --git a/extra/printf/printf.factor b/extra/printf/printf.factor index 0120891e12..ac02efba69 100644 --- a/extra/printf/printf.factor +++ b/extra/printf/printf.factor @@ -28,7 +28,7 @@ IN: printf [ 0 ] [ string>number ] if-empty ; : pad-digits ( string digits -- string' ) - [ "." split1 ] dip [ CHAR: 0 pad-right ] [ head-slice ] bi "." swap 3append ; + [ "." split1 ] dip [ CHAR: 0 pad-right ] [ head-slice ] bi "." glue ; : max-digits ( n digits -- n' ) 10 swap ^ [ * round ] keep / ; diff --git a/extra/sequences/lib/lib.factor b/extra/sequences/lib/lib.factor index 0674b8d9d2..72944c09b4 100755 --- a/extra/sequences/lib/lib.factor +++ b/extra/sequences/lib/lib.factor @@ -23,11 +23,11 @@ IN: sequences.lib ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : each-percent ( seq quot -- ) - >r - dup length - dup [ / ] curry - [ 1+ ] prepose - r> compose + [ + dup length + dup [ / ] curry + [ 1+ ] prepose + ] dip compose 2each ; inline ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -68,7 +68,7 @@ IN: sequences.lib : minmax ( seq -- min max ) #! find the min and max of a seq in one pass - 1/0. -1/0. rot [ tuck max >r min r> ] each ; + 1/0. -1/0. rot [ tuck max [ min ] dip ] each ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -78,7 +78,7 @@ IN: sequences.lib : (monotonic-split) ( seq quot -- newseq ) [ - >r dup unclip suffix r> + [ dup unclip suffix ] dip v, [ pick ,, call [ v, ] unless ] curry 2each ,v ] { } make ; @@ -88,7 +88,7 @@ IN: sequences.lib ERROR: element-not-found ; : split-around ( seq quot -- before elem after ) dupd find over [ element-not-found ] unless - >r cut rest r> swap ; inline + [ cut rest ] dip swap ; inline : map-until ( seq quot pred -- newseq ) '[ [ @ dup @ [ drop t ] [ , f ] if ] find 2drop ] { } make ; @@ -115,14 +115,14 @@ ERROR: element-not-found ; PRIVATE> : exact-strings ( alphabet length -- seqs ) - >r dup length r> exact-number-strings map-alphabet ; + [ dup length ] dip exact-number-strings map-alphabet ; : strings ( alphabet length -- seqs ) - >r dup length r> number-strings map-alphabet ; + [ dup length ] dip number-strings map-alphabet ; : switches ( seq1 seq -- subseq ) ! seq1 is a sequence of ones and zeroes - >r [ length ] keep [ nth 1 = ] curry filter r> + [ [ length ] keep [ nth 1 = ] curry filter ] dip [ nth ] curry { } map-as ; : power-set ( seq -- subsets ) @@ -147,7 +147,3 @@ PRIVATE> dup length 1 (a,b] [ dup random pick exchange ] each ; : enumerate ( seq -- seq' ) >alist ; - -: splice ( left-seq right-seq seq -- newseq ) swap 3append ; - -: surround ( seq left-seq right-seq -- newseq ) swapd 3append ; diff --git a/extra/webapps/blogs/blogs.factor b/extra/webapps/blogs/blogs.factor index e035090fb0..c16450bb25 100644 --- a/extra/webapps/blogs/blogs.factor +++ b/extra/webapps/blogs/blogs.factor @@ -50,7 +50,7 @@ M: entity feed-entry-date date>> ; TUPLE: post < entity title comments ; M: post feed-entry-title - [ author>> ] [ title>> ] bi ": " swap 3append ; + [ author>> ] [ title>> ] bi ": " glue ; M: post entity-url id>> view-post-url ;