From e70fcf159d9f8d48c8e575324aeec8da66c98486 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 17 Feb 2010 16:06:45 -0800 Subject: [PATCH] Revert "fix append-path and vocab-dir to use path-separator" This reverts commit 0f3026b8712816d29143ff49dea807acbf03e0e0. --- core/io/pathnames/pathnames.factor | 2 +- core/vocabs/loader/loader.factor | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor index 5a9c647973..b307128efb 100644 --- a/core/io/pathnames/pathnames.factor +++ b/core/io/pathnames/pathnames.factor @@ -103,7 +103,7 @@ PRIVATE> ] } [ [ trim-tail-separators ] - [ trim-head-separators ] bi* path-separator glue + [ trim-head-separators ] bi* "/" glue ] } cond ; diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index 0f2e3f7178..2c0f67641d 100644 --- a/core/vocabs/loader/loader.factor +++ b/core/vocabs/loader/loader.factor @@ -35,9 +35,7 @@ M: string vocab-path ( string -- path/f ) PRIVATE> : vocab-dir ( vocab -- dir ) - vocab-name - os windows? { { CHAR: . CHAR: \\ } } { { CHAR: . CHAR: / } } ? - substitute ; + vocab-name { { CHAR: . CHAR: / } } substitute ; : vocab-dir+ ( vocab str/f -- path ) [ vocab-name "." split ] dip