From 9bdde31783f67af7aedfa49957aeb947a2c0c4d0 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 6 Apr 2013 17:02:22 -0700 Subject: [PATCH] use concat instead of join. --- basis/alien/prettyprint/prettyprint.factor | 2 +- basis/byte-arrays/hex/hex.factor | 4 ++-- basis/ui/gestures/gestures.factor | 4 ++-- basis/xml/writer/writer.factor | 2 +- core/generic/single/single.factor | 2 +- extra/asn1/asn1.factor | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basis/alien/prettyprint/prettyprint.factor b/basis/alien/prettyprint/prettyprint.factor index f86944e0ed..bd91d04784 100644 --- a/basis/alien/prettyprint/prettyprint.factor +++ b/basis/alien/prettyprint/prettyprint.factor @@ -35,7 +35,7 @@ M: array c-type-string unclip [ [ unparse "[" "]" surround ] map ] [ c-type-string ] bi* - prefix "" join ; + prefix concat ; PRIVATE> : pprint-c-type ( c-type -- ) diff --git a/basis/byte-arrays/hex/hex.factor b/basis/byte-arrays/hex/hex.factor index 4912b0b98b..5474f1b745 100644 --- a/basis/byte-arrays/hex/hex.factor +++ b/basis/byte-arrays/hex/hex.factor @@ -7,8 +7,8 @@ IN: byte-arrays.hex ERROR: odd-length-hex-string string ; SYNTAX: HEX{ - "}" parse-tokens "" join + "}" parse-tokens concat [ blank? not ] filter dup length even? [ odd-length-hex-string ] unless - 2 group [ hex> ] B{ } map-as + 2 [ hex> ] B{ } map-as suffix! ; diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor index fb3f540209..944c860c0c 100644 --- a/basis/ui/gestures/gestures.factor +++ b/basis/ui/gestures/gestures.factor @@ -326,10 +326,10 @@ M: macosx modifiers>string { S+ [ "\u0021e7" ] } { C+ [ "\u002303" ] } } case - ] map "" join ; + ] map concat ; M: object modifiers>string - [ name>> ] map "" join ; + [ name>> ] map concat ; HOOK: keysym>string os ( keysym -- string ) diff --git a/basis/xml/writer/writer.factor b/basis/xml/writer/writer.factor index 296201474d..843f13361b 100644 --- a/basis/xml/writer/writer.factor +++ b/basis/xml/writer/writer.factor @@ -19,7 +19,7 @@ SYMBOL: indentation : indent-string ( -- string ) xml-pprint? get - [ indentation get indenter get "" join ] + [ indentation get indenter get concat ] [ "" ] if ; : ?indent ( -- ) diff --git a/core/generic/single/single.factor b/core/generic/single/single.factor index 2ef68c9292..1ef45e2e76 100644 --- a/core/generic/single/single.factor +++ b/core/generic/single/single.factor @@ -161,7 +161,7 @@ M: tag-dispatch-engine compile-engine : build-fast-hash ( methods -- buckets ) >alist V{ } clone [ hashcode 1array ] distribute-buckets - [ compile-engines* >alist { } join ] map ; + [ compile-engines* >alist concat ] map ; M: echelon-dispatch-engine compile-engine dup n>> 0 = [ diff --git a/extra/asn1/asn1.factor b/extra/asn1/asn1.factor index decaf29401..ae6611b2c1 100644 --- a/extra/asn1/asn1.factor +++ b/extra/asn1/asn1.factor @@ -215,7 +215,7 @@ M: string >ber ( str -- byte-array ) : >ber-seq-internal ( array code -- byte-array ) 1array "C" pack-native swap dup length >ber-length-encoding - swapd append swap [ number>string ] map "" join >array append ; + swapd append swap [ number>string ] map { } concat-as append ; M: array >ber ( array -- byte-array ) 0x30 >ber-seq-internal ;