steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use surround/glue instead of 3append

db4
Doug Coleman 2009-11-12 03:01:09 -06:00
parent a9eb2de22d
commit aec676edec
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/prettyprint/backend/backend.factor
View File

@ -116,8 +116,7 @@ M: pathname pprint*
: check-recursion ( obj quot -- ) : check-recursion ( obj quot -- )
nesting-limit? [ nesting-limit? [
drop drop
"~" over class name>> "~" 3append [ class name>> "~" dup surround ] keep present-text
swap present-text
] [ ] [
over recursion-check get member-eq? [ over recursion-check get member-eq? [
drop "~circularity~" swap present-text drop "~circularity~" swap present-text
@ -175,7 +174,7 @@ M: tuple pprint*
: pprint-elements ( seq -- ) : pprint-elements ( seq -- )
do-length-limit do-length-limit
[ [ pprint* ] each ] dip [ [ pprint* ] each ] dip
[ "~" swap number>string " more~" 3append text ] when* ; [ number>string "~" " more~" surround text ] when* ;
M: quotation pprint-delims drop \ [ \ ] ; M: quotation pprint-delims drop \ [ \ ] ;
M: curry pprint-delims drop \ [ \ ] ; M: curry pprint-delims drop \ [ \ ] ;

4
basis/xml/entities/html/html.factor
View File

@ -11,8 +11,8 @@ VALUE: html-entities
: get-html ( -- table ) : get-html ( -- table )
{ "lat1" "special" "symbol" } [ { "lat1" "special" "symbol" } [
"vocab:xml/entities/html/xhtml-" "vocab:xml/entities/html/xhtml-" ".ent" surround
swap ".ent" 3append read-entities-file read-entities-file
] map first3 assoc-union assoc-union ; ] map first3 assoc-union assoc-union ;
get-html to: html-entities get-html to: html-entities

4
core/bootstrap/primitives.factor
View File

@ -16,7 +16,7 @@ H{ } clone sub-primitives set
"vocab:bootstrap/syntax.factor" parse-file "vocab:bootstrap/syntax.factor" parse-file
"vocab:cpu/" architecture get { architecture get {
{ "x86.32" "x86/32" } { "x86.32" "x86/32" }
{ "winnt-x86.64" "x86/64/winnt" } { "winnt-x86.64" "x86/64/winnt" }
{ "unix-x86.64" "x86/64/unix" } { "unix-x86.64" "x86/64/unix" }
@ -24,7 +24,7 @@ H{ } clone sub-primitives set
{ "macosx-ppc" "ppc/macosx" } { "macosx-ppc" "ppc/macosx" }
{ "arm" "arm" } { "arm" "arm" }
} ?at [ "Bad architecture: " prepend throw ] unless } ?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 "vocab:bootstrap/layouts/layouts.factor" parse-file

4
core/io/pathnames/pathnames.factor
View File

@ -102,8 +102,8 @@ PRIVATE>
[ 2 head ] dip append [ 2 head ] dip append
] } ] }
[ [
[ trim-tail-separators "/" ] dip [ trim-tail-separators ]
trim-head-separators 3append [ trim-head-separators ] bi* "/" glue
] ]
} cond ; } cond ;

2
extra/irc/client/internals/internals.factor
View File

@ -26,7 +26,7 @@ IN: irc.client.internals
irc> [ connect>> ] [ reconnect-attempts>> ] bi do-connect ; irc> [ connect>> ] [ reconnect-attempts>> ] bi do-connect ;
: /JOIN ( channel password -- ) : /JOIN ( channel password -- )
[ " :" swap 3append ] when* "JOIN " prepend irc-print ; [ " :" glue ] when* "JOIN " prepend irc-print ;
: try-connect ( -- stream/f ) : try-connect ( -- stream/f )
irc> profile>> [ server>> ] [ port>> ] bi /CONNECT ; irc> profile>> [ server>> ] [ port>> ] bi /CONNECT ;

2
extra/mason/platform/platform.factor
View File

@ -17,4 +17,4 @@ IN: mason.platform
target-os get target-cpu get arch ; target-os get target-cpu get arch ;
: boot-image-name ( -- string ) : boot-image-name ( -- string )
"boot." boot-image-arch ".image" 3append ; boot-image-arch "boot." ".image" surround ;