diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index 0ba1d38ae6..04617a6c67 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -116,8 +116,7 @@ M: pathname pprint* : check-recursion ( obj quot -- ) nesting-limit? [ drop - "~" over class name>> "~" 3append - swap present-text + [ class name>> "~" dup surround ] keep present-text ] [ over recursion-check get member-eq? [ drop "~circularity~" swap present-text @@ -175,7 +174,7 @@ M: tuple pprint* : pprint-elements ( seq -- ) do-length-limit [ [ pprint* ] each ] dip - [ "~" swap number>string " more~" 3append text ] when* ; + [ number>string "~" " more~" surround text ] when* ; M: quotation pprint-delims drop \ [ \ ] ; M: curry pprint-delims drop \ [ \ ] ; diff --git a/basis/xml/entities/html/html.factor b/basis/xml/entities/html/html.factor index 04c0b66063..fd8480307a 100644 --- a/basis/xml/entities/html/html.factor +++ b/basis/xml/entities/html/html.factor @@ -11,8 +11,8 @@ VALUE: html-entities : get-html ( -- table ) { "lat1" "special" "symbol" } [ - "vocab:xml/entities/html/xhtml-" - swap ".ent" 3append read-entities-file + "vocab:xml/entities/html/xhtml-" ".ent" surround + read-entities-file ] map first3 assoc-union assoc-union ; get-html to: html-entities diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index 8b4c0a4a36..97c66530a0 100644 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -16,7 +16,7 @@ H{ } clone sub-primitives set "vocab:bootstrap/syntax.factor" parse-file -"vocab:cpu/" architecture get { +architecture get { { "x86.32" "x86/32" } { "winnt-x86.64" "x86/64/winnt" } { "unix-x86.64" "x86/64/unix" } @@ -24,7 +24,7 @@ H{ } clone sub-primitives set { "macosx-ppc" "ppc/macosx" } { "arm" "arm" } } ?at [ "Bad architecture: " prepend throw ] unless -"/bootstrap.factor" 3append parse-file +"vocab:cpu/" "/bootstrap.factor" surround parse-file "vocab:bootstrap/layouts/layouts.factor" parse-file diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor index 25eefd1105..b307128efb 100644 --- a/core/io/pathnames/pathnames.factor +++ b/core/io/pathnames/pathnames.factor @@ -102,8 +102,8 @@ PRIVATE> [ 2 head ] dip append ] } [ - [ trim-tail-separators "/" ] dip - trim-head-separators 3append + [ trim-tail-separators ] + [ trim-head-separators ] bi* "/" glue ] } cond ; diff --git a/extra/irc/client/internals/internals.factor b/extra/irc/client/internals/internals.factor index ef1695f563..f2030e87b0 100644 --- a/extra/irc/client/internals/internals.factor +++ b/extra/irc/client/internals/internals.factor @@ -26,7 +26,7 @@ IN: irc.client.internals irc> [ connect>> ] [ reconnect-attempts>> ] bi do-connect ; : /JOIN ( channel password -- ) - [ " :" swap 3append ] when* "JOIN " prepend irc-print ; + [ " :" glue ] when* "JOIN " prepend irc-print ; : try-connect ( -- stream/f ) irc> profile>> [ server>> ] [ port>> ] bi /CONNECT ; diff --git a/extra/mason/platform/platform.factor b/extra/mason/platform/platform.factor index d6be8654c5..2a33c5240b 100644 --- a/extra/mason/platform/platform.factor +++ b/extra/mason/platform/platform.factor @@ -17,4 +17,4 @@ IN: mason.platform target-os get target-cpu get arch ; : boot-image-name ( -- string ) - "boot." boot-image-arch ".image" 3append ; + boot-image-arch "boot." ".image" surround ;