fix using and in, rename windows -> windows-directory in shell32

diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor
index 17f8552c2bb664220b427bb703f9dbdc1f3ceda8..137e919412f65fb12c43d3a1355301fdaf887272 100755 (executable)
--- a/basis/io/directories/search/search.factor
+++ b/basis/io/directories/search/search.factor
@@ -56,4 +56,4 @@ PRIVATE>
 : find-in-directories ( directories bfs? quot -- path' )
     '[ _ _ find-file ] attempt-all ; inline
 
-os windows? [ "io.paths.windows" require ] when
+os windows? [ "io.directories.search.windows" require ] when

diff --git a/basis/io/directories/search/windows/windows.factor b/basis/io/directories/search/windows/windows.factor
index b9ef53f4f5bb135313d525bf99bb5c02ce22155e..91a4afd20dee0ffbc7a12970a8ff826d88df34ab 100644 (file)
--- a/basis/io/directories/search/windows/windows.factor
+++ b/basis/io/directories/search/windows/windows.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays fry io.pathnames kernel sequences windows.shell32 ;
-IN: io.paths
+USING: arrays fry io.pathnames kernel sequences windows.shell32
+io.directories.search ;
+IN: io.directories.search.windows
 
 : program-files-directories ( -- array )
     program-files program-files-x86 2array ; inline

diff --git a/basis/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor
index 13d71f1ff317f3d384ee263a664f3fe7294d64da..9fe83840e40a3e9804ac9a1210106a77ec2c5432 100644 (file)
--- a/basis/windows/shell32/shell32.factor
+++ b/basis/windows/shell32/shell32.factor
@@ -105,7 +105,7 @@ FUNCTION: HINSTANCE ShellExecuteW ( HWND hwnd, LPCTSTR lpOperation, LPCTSTR lpFi
 : application-data ( -- str )
     CSIDL_APPDATA shell32-directory ;
 
-: windows ( -- str )
+: windows-directory ( -- str )
     CSIDL_WINDOWS shell32-directory ;
 
 : programs ( -- str )