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

Merge git://factorcode.org/git/factor

db4
Doug Coleman 2008-02-01 23:56:09 -06:00
parent 698f4180bb 68b3d8e1d9
commit dcd2ce7b57
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/bootstrap/primitives.factor
View File

@ -15,12 +15,12 @@ crossref off
"resource:core/bootstrap/syntax.factor" parse-file "resource:core/bootstrap/syntax.factor" parse-file
"resource:core/cpu/" architecture get { "resource:core/cpu/" architecture get {
{ "x86.32" "x86/32" } { "x86.32" "x86/32" }
{ "x86.64" "x86/64" } { "x86.64" "x86/64" }
{ "linux-ppc" "ppc/linux" } { "linux-ppc" "ppc/linux" }
{ "macosx-ppc" "ppc/macosx" } { "macosx-ppc" "ppc/macosx" }
{ "arm" "arm" } { "arm" "arm" }
} at "/bootstrap.factor" 3append parse-file } at "/bootstrap.factor" 3append parse-file
"resource:core/bootstrap/layouts/layouts.factor" parse-file "resource:core/bootstrap/layouts/layouts.factor" parse-file
@ -626,7 +626,7 @@ builtins get num-tags get tail f union-class define-class
{ "<float-array>" "float-arrays" } { "<float-array>" "float-arrays" }
{ "curry" "kernel" } { "curry" "kernel" }
{ "<tuple-boa>" "tuples.private" } { "<tuple-boa>" "tuples.private" }
{ "class-hash" "kernel.private" } { "class-hash" "kernel.private" }
{ "callstack>array" "kernel" } { "callstack>array" "kernel" }
{ "innermost-frame-quot" "kernel.private" } { "innermost-frame-quot" "kernel.private" }
{ "innermost-frame-scan" "kernel.private" } { "innermost-frame-scan" "kernel.private" }

16
core/prettyprint/backend/backend.factor
View File

@ -58,17 +58,17 @@ M: f pprint* drop \ f pprint-word ;
! Strings ! Strings
: ch>ascii-escape ( ch -- str ) : ch>ascii-escape ( ch -- str )
H{ H{
{ CHAR: \e CHAR: \\e } { CHAR: \e CHAR: e }
{ CHAR: \n CHAR: \\n } { CHAR: \n CHAR: n }
{ CHAR: \r CHAR: \\r } { CHAR: \r CHAR: r }
{ CHAR: \t CHAR: \\t } { CHAR: \t CHAR: t }
{ CHAR: \0 CHAR: \\0 } { CHAR: \0 CHAR: 0 }
{ CHAR: \\ CHAR: \\\\ } { CHAR: \\ CHAR: \\ }
{ CHAR: \" CHAR: \\\" } { CHAR: \" CHAR: \" }
} at ; } at ;
: unparse-ch ( ch -- ) : unparse-ch ( ch -- )
dup ch>ascii-escape [ ] [ ] ?if , ; dup ch>ascii-escape [ "\\" % ] [ ] ?if , ;
: do-string-limit ( str -- trimmed ) : do-string-limit ( str -- trimmed )
string-limit get [ string-limit get [

2
core/strings/strings.factor
View File

@ -38,7 +38,7 @@ M: string set-nth-unsafe
>r >fixnum >r >fixnum r> r> set-string-nth ; >r >fixnum >r >fixnum r> r> set-string-nth ;
M: string clone M: string clone
(clone) dup string-aux clone over set-string-aux ; (clone) dup string-aux clone over set-string-aux ;
M: string resize resize-string ; M: string resize resize-string ;