libc: several vocabs now need to depend on libc

diff --git a/basis/calendar/unix/unix.factor b/basis/calendar/unix/unix.factor
index 973b316f9d4d3abba77191dc73a00095c82cbbd5..ac729a5cefcd8bb5d10879d33c6ecedb0b3f8cc9 100644 (file)
--- a/basis/calendar/unix/unix.factor
+++ b/basis/calendar/unix/unix.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.data calendar calendar.private
-classes.struct kernel math system unix unix.time unix.types ;
+classes.struct kernel math system libc unix unix.time unix.types ;
 IN: calendar.unix
 
 : timeval>seconds ( timeval -- seconds )

diff --git a/basis/environment/unix/unix.factor b/basis/environment/unix/unix.factor
index 96ad3759c4db171009b8dedad3f249fba4a1ab80..855a4d1404bbd56d0627326432e351b16734ebfd 100644 (file)
--- a/basis/environment/unix/unix.factor
+++ b/basis/environment/unix/unix.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.data alien.strings
-alien.syntax kernel layouts sequences system unix
+alien.syntax kernel layouts libc sequences system unix
 environment io.encodings.utf8 unix.utilities vocabs
 combinators alien.accessors unix.ffi ;
 IN: environment.unix

diff --git a/basis/io/backend/unix/multiplexers/epoll/epoll.factor b/basis/io/backend/unix/multiplexers/epoll/epoll.factor
index e2a7cda826d31d4b0c570de1e91c4da9dfe861c7..31a28662bb4c0092444b51509f5d1ca1aa14d766 100644 (file)
--- a/basis/io/backend/unix/multiplexers/epoll/epoll.factor
+++ b/basis/io/backend/unix/multiplexers/epoll/epoll.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors classes.struct kernel destructors bit-arrays
 sequences assocs specialized-arrays math namespaces
-locals fry unix unix.linux.epoll unix.time io.ports
+libc locals fry unix unix.linux.epoll unix.time io.ports
 io.backend.unix io.backend.unix.multiplexers ;
 SPECIALIZED-ARRAY: epoll-event
 IN: io.backend.unix.multiplexers.epoll

diff --git a/basis/io/backend/unix/unix.factor b/basis/io/backend/unix/unix.factor
index 91a1bd41d91c2d5f161b1b2f87165587396296c0..4cb07d780df010d2cbb7bdbcfa8acd045545dee2 100755 (executable)
--- a/basis/io/backend/unix/unix.factor
+++ b/basis/io/backend/unix/unix.factor
@@ -3,7 +3,7 @@
 USING: alien alien.c-types alien.data alien.syntax generic
 assocs kernel kernel.private math io.ports sequences strings
 sbufs threads unix unix.ffi unix.stat vectors io.buffers io.backend
-io.encodings math.parser continuations system libc namespaces
+io.encodings io.files math.parser continuations system libc namespaces
 make io.timeouts io.encodings.utf8 destructors
 destructors.private accessors summary combinators locals
 unix.time unix.types fry io.backend.unix.multiplexers

diff --git a/basis/io/directories/unix/linux/linux.factor b/basis/io/directories/unix/linux/linux.factor
index 3429d5beb2096f15be37a9f0b5248b11011d49ba..318a870a5b027534ec54f09aa7b202b1a6344e3f 100644 (file)
--- a/basis/io/directories/unix/linux/linux.factor
+++ b/basis/io/directories/unix/linux/linux.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.c-types alien.data io.directories.unix kernel
+USING: alien.c-types alien.data io.directories.unix kernel libc
 system unix classes.struct unix.ffi ;
 IN: io.directories.unix.linux
 

diff --git a/basis/io/files/info/unix/linux/linux.factor b/basis/io/files/info/unix/linux/linux.factor
index 21c784629e196b04dd05872efdcfe59a6a006b5e..6446dc269f8fb00b4a25c45178ea5883dbc3e3d4 100644 (file)
--- a/basis/io/files/info/unix/linux/linux.factor
+++ b/basis/io/files/info/unix/linux/linux.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types alien.syntax combinators csv
 io.backend io.encodings.utf8 io.files io.files.info
-io.files.unix kernel math.order namespaces sequences sorting
-system unix unix.statfs.linux unix.statvfs.linux io.files.links
+io.files.unix libc libc.linux kernel math.order namespaces sequences
+sorting system unix unix.statfs.linux unix.statvfs.linux io.files.links
 arrays io.files.info.unix assocs io.pathnames unix.types
 classes.struct ;
 FROM: csv => delimiter ;

diff --git a/basis/io/files/unix/unix.factor b/basis/io/files/unix/unix.factor
index e695345125ce8b058d888b3a3af7ea77e55b78de..63fbe1a1a9dc55696e460da9aabf5049acd07957 100644 (file)
--- a/basis/io/files/unix/unix.factor
+++ b/basis/io/files/unix/unix.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2008 Slava Pestov, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: unix byte-arrays kernel io.backend.unix math.bitwise
-io.ports io.files io.files.private io.pathnames environment
+io.ports io.files io.files.private io.pathnames libc environment
 destructors system unix.ffi literals ;
 IN: io.files.unix
 

diff --git a/basis/io/launcher/unix/unix.factor b/basis/io/launcher/unix/unix.factor
index 3c56dd0c272b8333cfcb1ae1ce1c21a9d8b275cc..0f9165a9772d8cd9324e1ed2e03fa07b956f9c25 100644 (file)
--- a/basis/io/launcher/unix/unix.factor
+++ b/basis/io/launcher/unix/unix.factor
@@ -3,9 +3,9 @@
 USING: accessors alien.c-types alien.data arrays assocs
 combinators continuations environment io io.backend
 io.backend.unix io.files io.files.private io.files.unix
-io.launcher io.pathnames io.ports kernel math namespaces
-sequences strings system threads unix unix.process unix.ffi
-simple-tokenizer ;
+io.launcher io.pathnames io.ports kernel libc math
+namespaces sequences strings system threads unix unix.process
+unix.ffi simple-tokenizer ;
 IN: io.launcher.unix
 
 : get-arguments ( process -- seq )

diff --git a/basis/io/monitors/linux/linux.factor b/basis/io/monitors/linux/linux.factor
index 9b2440aec88edc8bb975d312224b215c0f779141..d1047e7fbeb61e0047f682b8ab19b2237cd30c92 100755 (executable)
--- a/basis/io/monitors/linux/linux.factor
+++ b/basis/io/monitors/linux/linux.factor
@@ -3,7 +3,7 @@
 USING: kernel io.backend io.monitors io.monitors.recursive
 io.files io.pathnames io.buffers io.ports io.timeouts
 io.backend.unix io.encodings.utf8 unix.linux.inotify assocs
-namespaces make threads continuations init math math.bitwise
+namespaces make threads continuations init libc math math.bitwise
 sets alien alien.strings alien.c-types vocabs.loader accessors
 system hashtables destructors unix classes.struct literals ;
 FROM: namespaces => set ;

diff --git a/basis/io/pipes/unix/unix.factor b/basis/io/pipes/unix/unix.factor
index 2ac496469721b61d63708f031681c30a55189d8c..92058e805f14722f4e854505f9412bc9806d34fb 100644 (file)
--- a/basis/io/pipes/unix/unix.factor
+++ b/basis/io/pipes/unix/unix.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.data system kernel unix math sequences
-io.backend.unix io.ports specialized-arrays accessors unix.ffi ;
+io.backend.unix io.ports libc specialized-arrays accessors unix.ffi ;
 QUALIFIED: io.pipes
 SPECIALIZED-ARRAY: int
 IN: io.pipes.unix

diff --git a/basis/io/sockets/unix/unix.factor b/basis/io/sockets/unix/unix.factor
index 88af95c30969e60ed56a1f70a99cb13a0a6431d8..09e57edb5b60c6494035789c671bb162e6c77488 100644 (file)
--- a/basis/io/sockets/unix/unix.factor
+++ b/basis/io/sockets/unix/unix.factor
@@ -1,9 +1,10 @@
-! Copyright (C) 2004, 2008 Slava Pestov, Ivan Tikhonov. 
+! Copyright (C) 2004, 2008 Slava Pestov, Ivan Tikhonov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.data alien.strings
 classes.struct combinators destructors io.backend.unix
-io.encodings.utf8 io.pathnames io.sockets.private kernel libc
-locals math namespaces sequences system unix unix.ffi vocabs ;
+io.encodings.utf8 io.files io.pathnames io.sockets.private kernel
+libc locals math namespaces sequences system unix
+unix.ffi vocabs ;
 EXCLUDE: io => read write ;
 EXCLUDE: io.sockets => accept ;
 IN: io.sockets.unix

diff --git a/basis/libc/libc.factor b/basis/libc/libc.factor
index ab2d5047e651652f56bb3a48e691f6d85a6b762d..9cfbf24f7ab9b2dde2fc9f2d256c8dc4cf9d251b 100644 (file)
--- a/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -4,10 +4,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.destructors alien.syntax assocs
 combinators continuations destructors destructors.private kernel math
-namespaces prettyprint sequences sets summary system vocabs ;
+namespaces prettyprint sequences sets summary system vocabs vocabs.parser ;
 IN: libc
 
-<< "libc." os unparse append require >>
+<< "libc." os unparse append use-vocab >>
 
 LIBRARY: factor
 

diff --git a/basis/unix/process/process.factor b/basis/unix/process/process.factor
index f0d12d70d3317c158d47480bdc866cd86514bd7d..c575d639900c0455c9ced12809f48e46658c5dcc 100644 (file)
--- a/basis/unix/process/process.factor
+++ b/basis/unix/process/process.factor
@@ -1,7 +1,7 @@
 USING: kernel alien.c-types alien.data alien.strings sequences
 math alien.syntax unix namespaces continuations threads assocs
-io.backend.unix io.encodings.utf8 unix.types unix.utilities fry 
-unix.ffi ;
+io.backend.unix io.encodings.utf8 libc unix.types unix.utilities
+fry unix.ffi ;
 IN: unix.process
 
 ! Low-level Unix process launching utilities. These are used

diff --git a/basis/vocabs/refresh/monitor/monitor.factor b/basis/vocabs/refresh/monitor/monitor.factor
index 3f15bb951e7ad2acf9b79d2aed00954dcb157179..ccb87c88dcdc92ecdedf5101ba70f0e18ad2493c 100644 (file)
--- a/basis/vocabs/refresh/monitor/monitor.factor
+++ b/basis/vocabs/refresh/monitor/monitor.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs command-line concurrency.messaging
 continuations init io.backend io.files io.monitors io.pathnames
-kernel namespaces sequences sets splitting threads fry
+kernel libc namespaces sequences sets splitting threads fry
 tr vocabs vocabs.loader vocabs.refresh vocabs.cache
 io.files.links ;
 IN: vocabs.refresh.monitor

diff --git a/core/io/files/files.factor b/core/io/files/files.factor
index 88714c49cc5dbf76fc656fdee498ec25d7671fee..3a2baece25bb7ad5432ea92adf096623e6197d21 100644 (file)
--- a/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@ -14,7 +14,7 @@ SYMBOL: +output+
 GENERIC: drain ( port handle -- event/f )
 GENERIC: refill ( port handle -- event/f )
 
-HOOK: wait-for-fd ( handle event -- )
+HOOK: wait-for-fd io-backend ( handle event -- )
 
 MIXIN: file-reader
 MIXIN: file-writer