]> gitweb.factorcode.org Git - factor.git/commitdiff
Revert "fix append-path and vocab-dir to use path-separator"
authorJoe Groff <arcata@gmail.com>
Thu, 18 Feb 2010 00:06:45 +0000 (16:06 -0800)
committerJoe Groff <arcata@gmail.com>
Thu, 18 Feb 2010 00:06:45 +0000 (16:06 -0800)
This reverts commit 0f3026b8712816d29143ff49dea807acbf03e0e0.

core/io/pathnames/pathnames.factor
core/vocabs/loader/loader.factor

index 5a9c647973569f1f1de01300fcb07e6df14d81e3..b307128efb2287bbd60d9a36ffa7866aac42ab9b 100644 (file)
@@ -103,7 +103,7 @@ PRIVATE>
         ] }
         [
             [ trim-tail-separators ]
-            [ trim-head-separators ] bi* path-separator glue
+            [ trim-head-separators ] bi* "/" glue
         ]
     } cond ;
 
index 0f2e3f71785d2e4985eee48865e69c70540eed53..2c0f67641d15ef897aa1372b74b2f64dc8949f95 100644 (file)
@@ -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