basis/extra: cleanup some platform requires.

diff --git a/basis/io/files/temp/temp.factor b/basis/io/files/temp/temp.factor
index 9693223da9ef39377b2b2490f324959a6dacd7db..f6c4ad79a3500283cb7dbdff1cee0db6d1c38768 100644 (file)
--- a/basis/io/files/temp/temp.factor
+++ b/basis/io/files/temp/temp.factor
@@ -22,5 +22,4 @@ HOOK: cache-directory os ( -- path )
     { [ os windows? ] [ "io.files.temp.windows" ] }
     { [ os macosx? ] [ "io.files.temp.macosx" ] }
     { [ os unix? ] [ "io.files.temp.unix" ] }
-    [ "unknown io.files.temp platform" throw ]
 } cond require

diff --git a/basis/io/standard-paths/standard-paths.factor b/basis/io/standard-paths/standard-paths.factor
index e8bb48c0da5ed2f85ef027f1723d2ae1df798075..e2ba2333f13d0d39217ad46502548cb3e44486a3 100644 (file)
--- a/basis/io/standard-paths/standard-paths.factor
+++ b/basis/io/standard-paths/standard-paths.factor
@@ -15,9 +15,9 @@ HOOK: find-in-applications os ( directories filename -- path )
     [ [ find-in-path* ] keep over [ append-path ] [ 2drop f ] if ]
     if-empty ;
 
-os {
-    { [ dup macosx? ] [ drop "io.standard-paths.macosx" require ] }
-    { [ dup unix? ] [ drop "io.standard-paths.unix" require ] }
-    { [ dup windows? ] [ drop "io.standard-paths.windows" require ] }
-} cond
+{
+    { [ os windows? ] [ "io.standard-paths.windows" ] }
+    { [ os macosx? ] [ "io.standard-paths.macosx" ] }
+    { [ os unix? ] [ "io.standard-paths.unix" ] }
+} cond require
 

diff --git a/basis/unix/stat/stat.factor b/basis/unix/stat/stat.factor
index f52ccec7adf26e3989b896fee0dbbae7834073af..417ca094fd9c9c8d50e16bed0da342c5df813e58 100644 (file)
--- a/basis/unix/stat/stat.factor
+++ b/basis/unix/stat/stat.factor
@@ -1,14 +1,14 @@
-USING: kernel system combinators alien.syntax alien.c-types
-math vocabs vocabs.loader unix classes.struct ;
+USING: accessors alien.c-types alien.syntax classes.struct
+kernel sequences system unix vocabs ;
 IN: unix.stat
 
 ! File Types
 
 CONSTANT: S_IFMT   0o170000   ! These bits determine file type.
 
-CONSTANT: S_IFDIR  0o40000   ! Directory.
-CONSTANT: S_IFCHR  0o20000   ! Character device.
-CONSTANT: S_IFBLK  0o60000   ! Block device.
+CONSTANT: S_IFDIR  0o040000   ! Directory.
+CONSTANT: S_IFCHR  0o020000   ! Character device.
+CONSTANT: S_IFBLK  0o060000   ! Block device.
 CONSTANT: S_IFREG  0o100000   ! Regular file.
 CONSTANT: S_IFIFO  0o010000   ! FIFO.
 CONSTANT: S_IFLNK  0o120000   ! Symbolic link.
@@ -21,10 +21,7 @@ STRUCT: fsid
 TYPEDEF: fsid __fsid_t
 TYPEDEF: fsid fsid_t
 
-<< os {
-    { linux   [ "unix.stat.linux"   require ] }
-    { macosx  [ "unix.stat.macosx"  require ] }
-} case >>
+<< "unix.stat." os name>> append require >>
 
 : file-status ( pathname -- stat )
     \ stat <struct> [ [ stat-func ] unix-system-call drop ] keep ;

diff --git a/basis/unix/statvfs/statvfs.factor b/basis/unix/statvfs/statvfs.factor
index 89198df243b21ee36f69c29c986ebbf97a6f6691..898ba167653b8a5ad49d9d9111c4d0d7f01c1fda 100644 (file)
--- a/basis/unix/statvfs/statvfs.factor
+++ b/basis/unix/statvfs/statvfs.factor
@@ -1,9 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators system vocabs ;
+USING: accessors sequences system vocabs ;
 IN: unix.statvfs
 
-os {
-    { linux   [ "unix.statvfs.linux"   require ] }
-    { macosx  [ "unix.statvfs.macosx"  require ] }
-} case
+"unix.statvfs." os name>> append require

diff --git a/basis/unix/types/types.factor b/basis/unix/types/types.factor
index 08cb5cea1b156a900aaffd49866e5d4ef963e509..704dd7b7519fb049f80662d825618cb1f102494b 100644 (file)
--- a/basis/unix/types/types.factor
+++ b/basis/unix/types/types.factor
@@ -1,4 +1,5 @@
-USING: kernel system alien.c-types alien.syntax combinators vocabs ;
+USING: accessors alien.c-types alien.syntax system vocabs ;
+FROM: sequences => append ;
 IN: unix.types
 
 TYPEDEF: char int8_t
@@ -44,7 +45,4 @@ C-TYPE: rlimit
 C-TYPE: rusage
 C-TYPE: sockaddr
 
-os {
-    { linux   [ "unix.types.linux"   require ] }
-    { macosx  [ "unix.types.macosx"  require ] }
-} case
+"unix.types." os name>> append require

diff --git a/basis/unix/users/users.factor b/basis/unix/users/users.factor
index da47a4cc2021e0cc8915b944218a3d9562efe904..cebfb54b3feee3d2552c32631476bcf9ea2fb745 100644 (file)
--- a/basis/unix/users/users.factor
+++ b/basis/unix/users/users.factor
@@ -134,7 +134,4 @@ ERROR: no-such-user obj ;
 : user-home ( name/uid -- path )
     dup user-passwd [ nip dir>> ] [ no-such-user ] if* ;
 
-os {
-    { [ dup macosx? ] [ drop "unix.users.macosx" require ] }
-    { [ dup linux? ] [ drop ] }
-} cond
+os macosx? [ "unix.users.macosx" require ] when

diff --git a/extra/io/files/trash/trash.factor b/extra/io/files/trash/trash.factor
index 579f91ab2b94771ddcfda23c9bd6908a780a613c..bd12b5e287be6934574ebbbe8aa3fff8992b852d 100644 (file)
--- a/extra/io/files/trash/trash.factor
+++ b/extra/io/files/trash/trash.factor
@@ -8,8 +8,8 @@ IN: io.files.trash
 HOOK: send-to-trash os ( path -- )
 
 {
-    { [ os macosx? ] [ "io.files.trash.macosx"  ] }
-    { [ os unix?   ] [ "io.files.trash.unix"    ] }
-    { [ os windows?  ] [ "io.files.trash.windows" ] }
+    { [ os windows? ] [ "io.files.trash.windows" ] }
+    { [ os macosx? ] [ "io.files.trash.macosx" ] }
+    { [ os unix? ] [ "io.files.trash.unix" ] }
 } cond require
 

diff --git a/extra/time/time.factor b/extra/time/time.factor
index 3f73014f76069ee16d181e009e9396a19188bf87..fb837d399891b12aaed55fc1add6fbd435d14106 100644 (file)
--- a/extra/time/time.factor
+++ b/extra/time/time.factor
@@ -6,9 +6,8 @@ IN: time
 HOOK: set-time os ( timestamp -- )
 HOOK: adjust-time-monotonic os ( timestamp -- seconds )
 
-os {
-    { [ dup macosx? ] [ drop "time.macosx" require ] }
-    { [ dup windows? ] [ drop "time.windows" require ] }
-    { [ dup unix? ] [ drop "time.unix" require ] }
-    [ drop ]
-} cond
+{
+    { [ os windows? ] [ "time.windows" ] }
+    { [ os macosx? ] [ "time.macosx" ] }
+    { [ os unix? ] [ "time.unix" ] }
+} cond require