From bc4b8c8dee324c3de0baf9561920c6240c19e481 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 15 Dec 2008 21:45:36 -0600 Subject: [PATCH] fix using and in, rename windows -> windows-directory in shell32 --- basis/io/directories/search/search.factor | 2 +- basis/io/directories/search/windows/windows.factor | 5 +++-- basis/windows/shell32/shell32.factor | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor index 17f8552c2b..137e919412 100755 --- 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 b9ef53f4f5..91a4afd20d 100644 --- 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 13d71f1ff3..9fe83840e4 100644 --- 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 )