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

Revert "fix append-path and vocab-dir to use path-separator" 

This reverts commit 0f3026b871.
db4
Joe Groff 2010-02-17 16:06:45 -08:00
parent 97654b67c1
commit e70fcf159d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ PRIVATE>
] } ] }
[ [
[ trim-tail-separators ] [ trim-tail-separators ]
[ trim-head-separators ] bi* path-separator glue [ trim-head-separators ] bi* "/" glue
] ]
} cond ; } cond ;

4
core/vocabs/loader/loader.factor
View File

@ -35,9 +35,7 @@ M: string vocab-path ( string -- path/f )
PRIVATE> PRIVATE>
: vocab-dir ( vocab -- dir ) : vocab-dir ( vocab -- dir )
vocab-name vocab-name { { CHAR: . CHAR: / } } substitute ;
os windows? { { CHAR: . CHAR: \\ } } { { CHAR: . CHAR: / } } ?
substitute ;
: vocab-dir+ ( vocab str/f -- path ) : vocab-dir+ ( vocab str/f -- path )
[ vocab-name "." split ] dip [ vocab-name "." split ] dip