From 984c099de66d06ded3be0cbd2ed6851a5221d30b Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 15 Feb 2008 19:32:29 -0600 Subject: [PATCH] Updates for substitute change --- extra/io/windows/nt/files/files.factor | 4 ++-- extra/ui/commands/commands.factor | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/io/windows/nt/files/files.factor b/extra/io/windows/nt/files/files.factor index ecc989530e..f2be11855b 100755 --- a/extra/io/windows/nt/files/files.factor +++ b/extra/io/windows/nt/files/files.factor @@ -2,7 +2,7 @@ USING: continuations destructors io.buffers io.files io.backend io.timeouts io.nonblocking io.windows io.windows.nt.backend kernel libc math threads windows windows.kernel32 alien.c-types alien.arrays sequences combinators combinators.lib sequences.lib -ascii splitting alien strings ; +ascii splitting alien strings assocs ; IN: io.windows.nt.files M: windows-nt-io cwd @@ -60,7 +60,7 @@ M: windows-nt-io root-directory? ( path -- ? ) M: windows-nt-io normalize-pathname ( string -- string ) dup string? [ "pathname must be a string" throw ] unless - "/" split "\\" join + { { CHAR: / CHAR: \\ } } substitute cwd swap windows-path+ [ "/\\." member? ] right-trim dup peek CHAR: : = [ "\\" append ] when ; diff --git a/extra/ui/commands/commands.factor b/extra/ui/commands/commands.factor index 04f655853a..dbb838a5c5 100755 --- a/extra/ui/commands/commands.factor +++ b/extra/ui/commands/commands.factor @@ -51,7 +51,7 @@ GENERIC: command-word ( command -- word ) update-gestures ; : (command-name) ( string -- newstring ) - "-" split " " join >title ; + { { CHAR: - CHAR: \s } } substitute >title ; M: word command-name ( word -- str ) word-name