Fixing load-everything for io.files split

diff --git a/basis/ftp/client/client.factor b/basis/ftp/client/client.factor
index 9c82cdbb509b29e91de1adf7a7becd183a679823..ac21bb8f78b39aa1d1a824e2b2de656cc3f102a0 100644 (file)
--- a/basis/ftp/client/client.factor
+++ b/basis/ftp/client/client.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays classes.singleton combinators
 continuations io io.encodings.binary io.encodings.utf8
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays classes.singleton combinators
 continuations io io.encodings.binary io.encodings.utf8

-io.files io.sockets kernel io.streams.duplex math
+io.files io.pathnames io.sockets kernel io.streams.duplex math

 math.parser sequences splitting namespaces strings fry ftp
 ftp.client.listing-parser urls ;
 IN: ftp.client
 math.parser sequences splitting namespaces strings fry ftp
 ftp.client.listing-parser urls ;
 IN: ftp.client


@@ -104,7 +104,3 @@ ERROR: ftp-error got expected ;
         [ nip parent-directory ftp-cwd drop ]
         [ file-name (ftp-get) ] 2bi
     ] with-ftp-client ;
         [ nip parent-directory ftp-cwd drop ]
         [ file-name (ftp-get) ] 2bi
     ] with-ftp-client ;

-
-
-
-

diff --git a/basis/ftp/client/listing-parser/listing-parser.factor b/basis/ftp/client/listing-parser/listing-parser.factor
index 04e96ed77ab088edc1d39f4ad0591b0acfce411b..6183165b3adda6736a8e2d466bd34153e9fc51ee 100644 (file)
--- a/basis/ftp/client/listing-parser/listing-parser.factor
+++ b/basis/ftp/client/listing-parser/listing-parser.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors combinators io.files kernel math.parser
+USING: accessors combinators io.files.types kernel math.parser

 sequences splitting ;
 IN: ftp.client.listing-parser
 
 sequences splitting ;
 IN: ftp.client.listing-parser
 

diff --git a/basis/ftp/server/server.factor b/basis/ftp/server/server.factor
index ca27cbb784a8108a83db0120b067d81a4ca43bc6..d71179d599f0193e7e427cbb019143841d5057c8 100644 (file)
--- a/basis/ftp/server/server.factor
+++ b/basis/ftp/server/server.factor
@@ -2,12 +2,13 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit accessors combinators io
 io.encodings.8-bit io.encodings io.encodings.binary
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators.short-circuit accessors combinators io
 io.encodings.8-bit io.encodings io.encodings.binary

-io.encodings.utf8 io.files io.sockets kernel math.parser
-namespaces make sequences ftp io.launcher.unix.parser
-unicode.case splitting assocs classes io.servers.connection
-destructors calendar io.timeouts io.streams.duplex threads
-continuations math concurrency.promises byte-arrays
-io.backend tools.hexdump tools.files io.streams.string ;
+io.encodings.utf8 io.files io.files.info io.directories
+io.pathnames io.sockets kernel math.parser namespaces make
+sequences ftp io.launcher.unix.parser unicode.case splitting
+assocs classes io.servers.connection destructors calendar
+io.timeouts io.streams.duplex threads continuations math
+concurrency.promises byte-arrays io.backend tools.hexdump
+tools.files io.streams.string ;

 IN: ftp.server
 
 TUPLE: ftp-client url mode state command-promise user password ;
 IN: ftp.server
 
 TUPLE: ftp-client url mode state command-promise user password ;

diff --git a/basis/help/handbook/handbook.factor b/basis/help/handbook/handbook.factor
index cc36e9faab9f27b7949407dca6a907b54d7977e1..69c20468349b8a709326d4b0ef86cf5e8648be27 100644 (file)
--- a/basis/help/handbook/handbook.factor
+++ b/basis/help/handbook/handbook.factor
@@ -168,6 +168,11 @@ ARTICLE: "io" "Input and output"
 { $heading "Streams" }
 { $subsection "streams" }
 { $subsection "io.files" }
 { $heading "Streams" }
 { $subsection "streams" }
 { $subsection "io.files" }

+{ $heading "The file system" }
+{ $subsection "io.pathnames" }
+{ $subsection "io.files.info" }
+{ $subsection "io.files.links" }
+{ $subsection "io.directories" }

 { $heading "Encodings" }
 { $subsection "encodings-introduction" }
 { $subsection "io.encodings" }
 { $heading "Encodings" }
 { $subsection "encodings-introduction" }
 { $subsection "io.encodings" }

diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor
index a9df0bea811e49a37f554a217db98d8d387e8cdf..ec52264643e52a76a73812ef55cb1cf76f5c1955 100644 (file)
--- a/basis/help/html/html.factor
+++ b/basis/help/html/html.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.encodings.utf8 io.encodings.ascii io.encodings.binary
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.encodings.utf8 io.encodings.ascii io.encodings.binary

-io.files html.streams html.elements help kernel
+io.files io.files.temp io.directories html.streams html.elements help kernel

 assocs sequences make words accessors arrays help.topics vocabs
 tools.vocabs tools.vocabs.browser namespaces prettyprint io
 vocabs.loader serialize fry memoize unicode.case math.order
 assocs sequences make words accessors arrays help.topics vocabs
 tools.vocabs tools.vocabs.browser namespaces prettyprint io
 vocabs.loader serialize fry memoize unicode.case math.order

diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor
index 73cc239a56de12a63b391214a042e514c2c3e07b..c3c1ec2b9e29172f966eb9693565705f43b84be5 100644 (file)
--- a/basis/html/templates/chloe/chloe.factor
+++ b/basis/html/templates/chloe/chloe.factor
@@ -2,9 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel sequences combinators kernel fry
 namespaces make classes.tuple assocs splitting words arrays io
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel sequences combinators kernel fry
 namespaces make classes.tuple assocs splitting words arrays io

-io.files io.encodings.utf8 io.streams.string unicode.case
-mirrors math urls present multiline quotations xml logging
-continuations
+io.files io.files.info io.encodings.utf8 io.streams.string
+unicode.case mirrors math urls present multiline quotations xml
+logging continuations

 xml.data
 html.forms
 html.elements
 xml.data
 html.forms
 html.elements

diff --git a/basis/http/server/static/static.factor b/basis/http/server/static/static.factor
index 0bc644d019dc109b22bbd38bb4f3dd02614b8895..b19bf2ae55be4d9a6911b92a3a63ab987aba4747 100644 (file)
--- a/basis/http/server/static/static.factor
+++ b/basis/http/server/static/static.factor
@@ -1,14 +1,11 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 ! Copyright (C) 2004, 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r

-USING: calendar io io.files kernel math math.order\r
-math.parser namespaces parser sequences strings\r
-assocs hashtables debugger mime.types sorting logging\r
-calendar.format accessors splitting\r
-io.encodings.binary fry xml.entities destructors urls\r
-html.elements html.templates.fhtml\r
-http\r
-http.server\r
-http.server.responses\r
+USING: calendar kernel math math.order math.parser namespaces\r
+parser sequences strings assocs hashtables debugger mime.types\r
+sorting logging calendar.format accessors splitting io io.files\r
+io.files.info io.directories io.pathnames io.encodings.binary\r
+fry xml.entities destructors urls html.elements\r
+html.templates.fhtml http http.server http.server.responses\r

 http.server.redirection ;\r
 IN: http.server.static\r
 \r
 http.server.redirection ;\r
 IN: http.server.static\r
 \r

diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor
index 10365e978560ecab5e2779bb8001a9fac1161317..17f8552c2bb664220b427bb703f9dbdc1f3ceda8 100755 (executable)
--- a/basis/io/directories/search/search.factor
+++ b/basis/io/directories/search/search.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays continuations deques dlists fry
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays continuations deques dlists fry

-io.directories io.directories.search.private io.files
-io.files.info io.pathnames kernel sequences system
-vocabs.loader ;
+io.directories io.files io.files.info io.pathnames kernel
+sequences system vocabs.loader ;

 IN: io.directories.search
 
 TUPLE: directory-iterator path bfs queue ;
 IN: io.directories.search
 
 TUPLE: directory-iterator path bfs queue ;

diff --git a/basis/io/files/unique/unique-docs.factor b/basis/io/files/unique/unique-docs.factor
index bfde09dc487b02532bcf22a4f67c968f180b73f8..681cd94a38043ff5363babe93cf61b7626ad4ecc 100644 (file)
--- a/basis/io/files/unique/unique-docs.factor
+++ b/basis/io/files/unique/unique-docs.factor
@@ -1,5 +1,5 @@
 USING: help.markup help.syntax io io.ports kernel math
 USING: help.markup help.syntax io io.ports kernel math

-io.files.unique.private math.parser io.files ;
+io.pathnames io.directories math.parser io.files ;

 IN: io.files.unique
 
 HELP: temporary-path
 IN: io.files.unique
 
 HELP: temporary-path

diff --git a/basis/io/files/unique/unique.factor b/basis/io/files/unique/unique.factor
index 79afefa05debdd983e9df68ad5e5f3382637aef9..02f4d6080c705c27d338b5214fde80b8af962ab3 100644 (file)
--- a/basis/io/files/unique/unique.factor
+++ b/basis/io/files/unique/unique.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators continuations fry io io.backend
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays combinators continuations fry io io.backend

-io.directories io.files io.files.unique.private io.pathnames
+io.directories io.directories.hierarchy io.files io.pathnames

 kernel math math.bitwise math.parser namespaces random
 sequences system vocabs.loader ;
 IN: io.files.unique
 kernel math math.bitwise math.parser namespaces random
 sequences system vocabs.loader ;
 IN: io.files.unique

diff --git a/basis/io/monitors/recursive/recursive.factor b/basis/io/monitors/recursive/recursive.factor
index a96c6f04f14123723d0d97133b374bc1e4b700d5..18fa62f6d69bad878a5eca23a761d1d125331c7e 100644 (file)
--- a/basis/io/monitors/recursive/recursive.factor
+++ b/basis/io/monitors/recursive/recursive.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors sequences assocs arrays continuations
 destructors combinators kernel threads concurrency.messaging
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors sequences assocs arrays continuations
 destructors combinators kernel threads concurrency.messaging

-concurrency.mailboxes concurrency.promises io.files io.monitors
-debugger fry ;
+concurrency.mailboxes concurrency.promises io.files io.files.info
+io.directories io.pathnames io.monitors debugger fry ;

 IN: io.monitors.recursive
 
 ! Simulate recursive monitors on platforms that don't have them
 IN: io.monitors.recursive
 
 ! Simulate recursive monitors on platforms that don't have them

diff --git a/basis/mime/types/types.factor b/basis/mime/types/types.factor
index bb0d674f23b2995e61782a9690933bb0b9a5f53e..ac5233c543292b16e764aa966ed2622bc5ba2e11 100644 (file)
--- a/basis/mime/types/types.factor
+++ b/basis/mime/types/types.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: io.files io.encodings.ascii assocs sequences splitting
-kernel namespaces fry memoize ;
+USING: io.pathnames io.files io.encodings.ascii assocs sequences
+splitting kernel namespaces fry memoize ;

 IN: mime.types
 
 MEMO: mime-db ( -- seq )
 IN: mime.types
 
 MEMO: mime-db ( -- seq )

diff --git a/basis/tools/files/files.factor b/basis/tools/files/files.factor
index 7968639d47ff510987d6e1d3e6429ded5ad08735..54882800b0e0086398f868722209933e967f545b 100755 (executable)
--- a/basis/tools/files/files.factor
+++ b/basis/tools/files/files.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors arrays combinators io io.files kernel
-math.parser sequences system vocabs.loader calendar math
-symbols fry prettyprint ;
+USING: accessors arrays combinators io io.files io.files.info
+io.directories kernel math.parser sequences system vocabs.loader
+calendar math symbols fry prettyprint ;

 IN: tools.files
 
 <PRIVATE
 IN: tools.files
 
 <PRIVATE

diff --git a/basis/tools/files/unix/unix.factor b/basis/tools/files/unix/unix.factor
index 3449968f702c25a69daf681e8cbb19018643bebb..3b32f7b52d373bfbd327ee03c8b6885469065703 100755 (executable)
--- a/basis/tools/files/unix/unix.factor
+++ b/basis/tools/files/unix/unix.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors combinators kernel system unicode.case
-io.files.unix tools.files generalizations strings
-arrays sequences io.files math.parser unix.groups unix.users
+USING: accessors combinators kernel system unicode.case io.files
+io.files.info io.files.info.unix tools.files generalizations
+strings arrays sequences math.parser unix.groups unix.users

 tools.files.private unix.stat math ;
 IN: tools.files.unix
 
 tools.files.private unix.stat math ;
 IN: tools.files.unix
 

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index d8822f51dc1eb4064d346282b3086e1edec3fda1..b6e8eb2a4644423dd5c84cb11a7b13b14345df56 100644 (file)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -1,10 +1,11 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: assocs io.files hashtables kernel namespaces sequences
-vocabs.loader io combinators io.encodings.utf8 calendar accessors
-math.parser io.streams.string ui.tools.operations quotations
-strings arrays prettyprint words vocabs sorting sets
-classes math alien urls splitting ascii ;
+USING: assocs io.files io.pathnames io.directories
+io.encodings.utf8 hashtables kernel namespaces sequences
+vocabs.loader io combinators calendar accessors math.parser
+io.streams.string ui.tools.operations quotations strings arrays
+prettyprint words vocabs sorting sets classes math alien urls
+splitting ascii ;

 IN: tools.scaffold
 
 SYMBOL: developer-name
 IN: tools.scaffold
 
 SYMBOL: developer-name

diff --git a/basis/xmode/code2html/responder/responder.factor b/basis/xmode/code2html/responder/responder.factor
index 9115b1389bc323a69caeaf32b07894f7c2173ad7..39ff627b8460748ba10ea75ba273a3fb7fce32a7 100644 (file)
--- a/basis/xmode/code2html/responder/responder.factor
+++ b/basis/xmode/code2html/responder/responder.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 ! Copyright (C) 2007, 2008 Slava Pestov.\r
 ! See http://factorcode.org/license.txt for BSD license.\r

-USING: io io.files io.encodings.utf8 namespaces http.server\r
-http.server.responses http.server.static http xmode.code2html\r
-kernel sequences accessors fry ;\r
+USING: io io.files io.pathnames io.encodings.utf8 namespaces\r
+http.server http.server.responses http.server.static http\r
+xmode.code2html kernel sequences accessors fry ;\r

 IN: xmode.code2html.responder\r
 \r
 : <sources> ( root -- responder )\r
 IN: xmode.code2html.responder\r
 \r
 : <sources> ( root -- responder )\r

diff --git a/core/io/pathnames/pathnames-docs.factor b/core/io/pathnames/pathnames-docs.factor
index 21fd5b4b36b55a19b096b6dca04c67315bac00b2..3ba864d471f1a153345442046313a416c26b354e 100644 (file)
--- a/core/io/pathnames/pathnames-docs.factor
+++ b/core/io/pathnames/pathnames-docs.factor
@@ -65,7 +65,7 @@ HELP: home
 { $values { "dir" string } }
 { $description "Outputs the user's home directory." } ;
 
 { $values { "dir" string } }
 { $description "Outputs the user's home directory." } ;
 

-ARTICLE: "pathnames" "Pathname manipulation"
+ARTICLE: "io.pathnames" "Pathname manipulation"

 "Pathname manipulation:"
 { $subsection parent-directory }
 { $subsection file-name }
 "Pathname manipulation:"
 { $subsection parent-directory }
 { $subsection file-name }

diff --git a/extra/benchmark/mandel/mandel.factor b/extra/benchmark/mandel/mandel.factor
index 64a673c8ec9faa7df8520f6f5fec69a30dc17422..c501c35c6a2ea5fd9674c555780183de2af99ffe 100755 (executable)
--- a/extra/benchmark/mandel/mandel.factor
+++ b/extra/benchmark/mandel/mandel.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io kernel math math.functions sequences prettyprint
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io kernel math math.functions sequences prettyprint

-io.files io.encodings io.encodings.ascii io.encodings.binary fry
-benchmark.mandel.params benchmark.mandel.colors ;
+io.files io.files.temp io.encodings io.encodings.ascii
+io.encodings.binary fry benchmark.mandel.params
+benchmark.mandel.colors ;

 IN: benchmark.mandel
 
 : x-inc width  200000 zoom-fact * / ; inline
 IN: benchmark.mandel
 
 : x-inc width  200000 zoom-fact * / ; inline

diff --git a/extra/benchmark/random/random.factor b/extra/benchmark/random/random.factor
index 985c9a59b24477dd9f542290990bbe040d8a0cd2..d2eb4cdab516be55c12187715c799d1585e000b2 100755 (executable)
--- a/extra/benchmark/random/random.factor
+++ b/extra/benchmark/random/random.factor
@@ -1,4 +1,5 @@
-USING: io.files io.encodings.ascii random math.parser io math ;
+USING: io io.files io.files.temp io.encodings.ascii random
+math.parser math ;

 IN: benchmark.random
 
 : random-numbers-path ( -- path )
 IN: benchmark.random
 
 : random-numbers-path ( -- path )

diff --git a/extra/benchmark/raytracer/raytracer.factor b/extra/benchmark/raytracer/raytracer.factor
index 7fe46e9c367783af1786e7ac4b66b8246fbe61cd..c16e47846efb16c13f719e8e49d3b1ea4ad850e3 100755 (executable)
--- a/extra/benchmark/raytracer/raytracer.factor
+++ b/extra/benchmark/raytracer/raytracer.factor
@@ -2,8 +2,9 @@
 ! http://www.ffconsultancy.com/free/ray_tracer/languages.html
 
 USING: arrays accessors specialized-arrays.double io io.files
 ! http://www.ffconsultancy.com/free/ray_tracer/languages.html
 
 USING: arrays accessors specialized-arrays.double io io.files

-io.encodings.binary kernel math math.functions math.vectors
-math.parser make sequences sequences.private words hints ;
+io.files.temp io.encodings.binary kernel math math.functions
+math.vectors math.parser make sequences sequences.private words
+hints ;

 IN: benchmark.raytracer
 
 ! parameters
 IN: benchmark.raytracer
 
 ! parameters

diff --git a/extra/benchmark/reverse-complement/reverse-complement.factor b/extra/benchmark/reverse-complement/reverse-complement.factor
index 665cbba30d60d9b5f234f7cb25f18aab0fc5ffd5..3298706da305a6d62f20e68c75fa42fd359f5cc4 100755 (executable)
--- a/extra/benchmark/reverse-complement/reverse-complement.factor
+++ b/extra/benchmark/reverse-complement/reverse-complement.factor
@@ -1,6 +1,8 @@
-USING: io io.files io.streams.duplex kernel sequences
-sequences.private strings vectors words memoize splitting
-grouping hints tr continuations io.encodings.ascii
+! Copyright (C) 2006, 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: io io.files io.files.temp io.streams.duplex kernel
+sequences sequences.private strings vectors words memoize
+splitting grouping hints tr continuations io.encodings.ascii

 unicode.case ;
 IN: benchmark.reverse-complement
 
 unicode.case ;
 IN: benchmark.reverse-complement
 

diff --git a/extra/benchmark/xml/xml.factor b/extra/benchmark/xml/xml.factor
index a61293cd995025e006dfb9293f2ff2a76276c973..a32a98a13308e0d2a0aa0f30ba47026e562c379f 100644 (file)
--- a/extra/benchmark/xml/xml.factor
+++ b/extra/benchmark/xml/xml.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: io.encodings.utf8 io.files kernel sequences xml ;
+USING: io.encodings.utf8 io.directories io.files kernel
+sequences xml ;

 IN: benchmark.xml
 
 : xml-benchmark ( -- )
 IN: benchmark.xml
 
 : xml-benchmark ( -- )

diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor
index 9dddd0d8cd56afe19a533aae99b72104144be492..3e0019110884491d1dbd441963a17a7053e0a83b 100755 (executable)
--- a/extra/bunny/model/model.factor
+++ b/extra/bunny/model/model.factor
@@ -1,6 +1,6 @@
 USING: accessors alien.c-types arrays combinators destructors
 USING: accessors alien.c-types arrays combinators destructors

-http.client io io.encodings.ascii io.files kernel math
-math.matrices math.parser math.vectors opengl
+http.client io io.encodings.ascii io.files io.files.temp kernel
+math math.matrices math.parser math.vectors opengl

 opengl.capabilities opengl.gl opengl.demo-support sequences
 splitting vectors words specialized-arrays.float
 specialized-arrays.uint ;
 opengl.capabilities opengl.gl opengl.demo-support sequences
 splitting vectors words specialized-arrays.float
 specialized-arrays.uint ;

diff --git a/extra/contributors/contributors.factor b/extra/contributors/contributors.factor
index 4d6479db915d00bb1bfb9fa31de98a05d29a5148..1879c52826035660476ec8fb72ae773d5932d481 100755 (executable)
--- a/extra/contributors/contributors.factor
+++ b/extra/contributors/contributors.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: io.files io.launcher io.styles io.encodings.ascii
-prettyprint io hashtables kernel sequences assocs system sorting
-math.parser sets ;
+USING: io.files io.launcher io.directories io.pathnames
+io.encodings.ascii io prettyprint hashtables kernel sequences
+assocs system sorting math.parser sets ;

 IN: contributors
 
 : changelog ( -- authors )
 IN: contributors
 
 : changelog ( -- authors )

diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index eee33a13c86cae4af4e5ba7670774f1f941a0331..2de80de4a4595aec2a846b5752dcc16e12067a06 100644 (file)
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -2,11 +2,11 @@
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: accessors arrays classes classes.tuple compiler.units
 ! See http://factorcode.org/license.txt for BSD license.
 
 USING: accessors arrays classes classes.tuple compiler.units

-combinators continuations debugger definitions eval help
-io io.files io.streams.string kernel lexer listener listener.private
-make math namespaces parser prettyprint prettyprint.config
-quotations sequences strings source-files tools.vocabs
-vectors vocabs vocabs.loader ;
+combinators continuations debugger definitions eval help io
+io.files io.pathnames io.streams.string kernel lexer listener
+listener.private make math namespaces parser prettyprint
+prettyprint.config quotations sequences strings source-files
+tools.vocabs vectors vocabs vocabs.loader ;

 
 IN: fuel
 
 
 IN: fuel
 

diff --git a/extra/geo-ip/geo-ip.factor b/extra/geo-ip/geo-ip.factor
index aee53f24f50e1dda34747e1af1e6347b381f232d..c878306d7df4fbb43ffef82a6c9818b0e4aafb75 100644 (file)
--- a/extra/geo-ip/geo-ip.factor
+++ b/extra/geo-ip/geo-ip.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel sequences io.files io.launcher io.encodings.ascii
-io.streams.string http.client generalizations combinators
-math.parser math.vectors math.intervals interval-maps memoize
-csv accessors assocs strings math splitting grouping arrays ;
+USING: kernel sequences io.files io.files.temp io.launcher
+io.pathnames io.encodings.ascii io.streams.string http.client
+generalizations combinators math.parser math.vectors
+math.intervals interval-maps memoize csv accessors assocs
+strings math splitting grouping arrays ;

 IN: geo-ip
 
 : db-path ( -- path ) "IpToCountry.csv" temp-file ;
 IN: geo-ip
 
 : db-path ( -- path ) "IpToCountry.csv" temp-file ;

diff --git a/extra/irc/ui/load/load.factor b/extra/irc/ui/load/load.factor
index e6f4d07b56492e25bbb8a449cc734fd701d2620e..6048d93711ed857f20c579bc5928c56255975098 100755 (executable)
--- a/extra/irc/ui/load/load.factor
+++ b/extra/irc/ui/load/load.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 William Schlieper\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 \r
 ! Copyright (C) 2008 William Schlieper\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 \r

-USING: kernel io.files parser editors sequences ;\r
+USING: kernel io.files io.pathnames parser editors sequences ;\r

 \r
 IN: irc.ui.load\r
 \r
 \r
 IN: irc.ui.load\r
 \r

diff --git a/extra/log-viewer/log-viewer.factor b/extra/log-viewer/log-viewer.factor
index 7bc63d3e3482cb5f4572e41351fbf86e5bf8dc72..263454f7692e132ad57205976240068a3685299a 100755 (executable)
--- a/extra/log-viewer/log-viewer.factor
+++ b/extra/log-viewer/log-viewer.factor
@@ -1,4 +1,4 @@
-USING: kernel io io.files io.monitors io.encodings.utf8 ;\r
+USING: kernel io io.files io.pathnames io.monitors io.encodings.utf8 ;\r

 IN: log-viewer\r
 \r
 : read-lines ( stream -- )\r
 IN: log-viewer\r
 \r
 : read-lines ( stream -- )\r

diff --git a/extra/mason/build/build.factor b/extra/mason/build/build.factor
index 35070d89023f275c6e61a57fe3a8d5b2191c0ff2..4d705610b4a7dd240056d7f1634c0908dc5b0483 100644 (file)
--- a/extra/mason/build/build.factor
+++ b/extra/mason/build/build.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: io.files io.launcher io.encodings.utf8 prettyprint arrays
-calendar namespaces mason.common mason.child
-mason.release mason.report mason.email mason.cleanup
-mason.help ;
+USING: arrays calendar io.directories io.encodings.utf8
+io.files io.launcher mason.child mason.cleanup mason.common
+mason.email mason.help mason.release mason.report namespaces
+prettyprint ;

 IN: mason.build
 
 : create-build-dir ( -- )
 IN: mason.build
 
 : create-build-dir ( -- )

diff --git a/extra/mason/child/child.factor b/extra/mason/child/child.factor
index 0c9669ed5a5a5425088dc0c54df89dfaf3c24665..5a3a0d6ceb939a3bf8dbac1428fe5aec19a21752 100644 (file)
--- a/extra/mason/child/child.factor
+++ b/extra/mason/child/child.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces make debugger sequences io.files
-io.launcher arrays accessors calendar continuations
-combinators.short-circuit mason.common mason.report
-mason.platform mason.config http.client ;
+USING: accessors arrays calendar combinators.short-circuit
+continuations debugger http.client io.directories io.files
+io.launcher io.pathnames kernel make mason.common mason.config
+mason.platform mason.report namespaces sequences ;

 IN: mason.child
 
 : make-cmd ( -- args )
 IN: mason.child
 
 : make-cmd ( -- args )

diff --git a/extra/mason/cleanup/cleanup.factor b/extra/mason/cleanup/cleanup.factor
index ae24f533d6384be3fa805e7fcd1ad0f8fa6fe312..a2c087392a3aa5b698334587601cb4f0037456e8 100644 (file)
--- a/extra/mason/cleanup/cleanup.factor
+++ b/extra/mason/cleanup/cleanup.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces arrays continuations io.files io.launcher
-mason.common mason.platform mason.config ;
+USING: arrays continuations io.directories
+io.directories.hierarchy io.files io.launcher kernel
+mason.common mason.config mason.platform namespaces ;

 IN: mason.cleanup
 
 : compress-image ( -- )
 IN: mason.cleanup
 
 : compress-image ( -- )

diff --git a/extra/mason/common/common.factor b/extra/mason/common/common.factor
index 49f280fa84977ba8926d233d737b4398ccf1aff7..ec0cbdbc9c4e92bc96cccf4bd37e20cddffc06ac 100644 (file)
--- a/extra/mason/common/common.factor
+++ b/extra/mason/common/common.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel namespaces sequences splitting system accessors
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel namespaces sequences splitting system accessors

-math.functions make io io.files io.launcher io.encodings.utf8
-prettyprint combinators.short-circuit parser combinators
-calendar calendar.format arrays mason.config locals ;
+math.functions make io io.files io.pathnames io.directories
+io.launcher io.encodings.utf8 prettyprint
+combinators.short-circuit parser combinators calendar
+calendar.format arrays mason.config locals ;

 IN: mason.common
 
 : short-running-process ( command -- )
 IN: mason.common
 
 : short-running-process ( command -- )

diff --git a/extra/mason/config/config.factor b/extra/mason/config/config.factor
index 9169fbf1960d036784f2c2e53aa629b6bba61672..b1739d85faff15c104a0ecdf3acbe86f2e9766ef 100644 (file)
--- a/extra/mason/config/config.factor
+++ b/extra/mason/config/config.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: system io.files namespaces kernel accessors assocs ;
+USING: system io.files io.pathnames namespaces kernel accessors
+assocs ;

 IN: mason.config
 
 ! (Optional) Location for build directories
 IN: mason.config
 
 ! (Optional) Location for build directories

diff --git a/extra/mason/help/help.factor b/extra/mason/help/help.factor
index c9ca50f0c2a91faa8f2a134e67d641c1c0e16c0b..9a4e2be99630001a594b870551f96fd1229112cf 100644 (file)
--- a/extra/mason/help/help.factor
+++ b/extra/mason/help/help.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: help.html sequences io.files io.launcher make namespaces
-kernel arrays mason.common mason.config ;
+USING: arrays help.html io.directories io.files io.launcher
+kernel make mason.common mason.config namespaces sequences ;

 IN: mason.help
 
 : make-help-archive ( -- )
 IN: mason.help
 
 : make-help-archive ( -- )

diff --git a/extra/mason/mason.factor b/extra/mason/mason.factor
index 4f9c8f65d37dbbbb217c0b691fcc4a90d86894cd..299a2f4e1fe1a885bd24cd656577f2269a4e8455 100644 (file)
--- a/extra/mason/mason.factor
+++ b/extra/mason/mason.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel debugger io io.files threads debugger continuations
-namespaces accessors calendar mason.common mason.updates
-mason.build mason.email ;
+USING: accessors calendar continuations debugger debugger io
+io.directories io.files kernel mason.build mason.common
+mason.email mason.updates namespaces threads ;

 IN: mason
 
 : build-loop-error ( error -- )
 IN: mason
 
 : build-loop-error ( error -- )

diff --git a/extra/mason/release/archive/archive.factor b/extra/mason/release/archive/archive.factor
index e76979d88527bda187acb5cce23f7fee5778a8fa..5ef424ad4f6e4e2a0e91e244092687dce31a7df5 100644 (file)
--- a/extra/mason/release/archive/archive.factor
+++ b/extra/mason/release/archive/archive.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel combinators sequences make namespaces io.files
-io.launcher prettyprint arrays
-mason.common mason.platform mason.config ;
+USING: arrays combinators io.directories
+io.directories.hierarchy io.files io.launcher io.pathnames
+kernel make mason.common mason.config mason.platform namespaces
+prettyprint sequences ;

 IN: mason.release.archive
 
 : base-name ( -- string )
 IN: mason.release.archive
 
 : base-name ( -- string )

diff --git a/extra/mason/release/branch/branch.factor b/extra/mason/release/branch/branch.factor
index 600b08c6b66e4fbc0e05add1dca8eda90ec2f825..75ce828c2801cf1ad9570ab5e9917de65470fd05 100644 (file)
--- a/extra/mason/release/branch/branch.factor
+++ b/extra/mason/release/branch/branch.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces sequences prettyprint io.files
-io.launcher make mason.common mason.platform mason.config ;
+USING: io.directories io.files io.launcher kernel make
+mason.common mason.config mason.platform namespaces prettyprint
+sequences ;

 IN: mason.release.branch
 
 : branch-name ( -- string ) "clean-" platform append ;
 IN: mason.release.branch
 
 : branch-name ( -- string ) "clean-" platform append ;

diff --git a/extra/mason/release/tidy/tidy.factor b/extra/mason/release/tidy/tidy.factor
index fb931650d448230b06f77083ea3abaf2a751cbbe..58046ce64c9050a2fc559c997fbde54408f556d3 100644 (file)
--- a/extra/mason/release/tidy/tidy.factor
+++ b/extra/mason/release/tidy/tidy.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces continuations debugger sequences fry
-io.files io.launcher bootstrap.image qualified mason.common
-mason.config ;
+USING: bootstrap.image continuations debugger fry
+io.directories io.directories.hierarchy io.files io.launcher
+kernel mason.common namespaces qualified sequences ;

 FROM: mason.config => target-os ;
 IN: mason.release.tidy
 
 FROM: mason.config => target-os ;
 IN: mason.release.tidy
 

diff --git a/extra/mason/test/test.factor b/extra/mason/test/test.factor
index b23ad19e5e7d9836eaf9da261751c0e86fb56256..a15a96c63eaea977e65ee81fcc682affe86641b5 100644 (file)
--- a/extra/mason/test/test.factor
+++ b/extra/mason/test/test.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: kernel namespaces assocs io.files io.encodings.utf8
-prettyprint help.lint benchmark tools.time bootstrap.stage2
-tools.test tools.vocabs help.html mason.common words generic
-accessors compiler.errors sequences sets sorting math ;
+USING: accessors assocs benchmark bootstrap.stage2
+compiler.errors generic help.html help.lint io.directories
+io.encodings.utf8 io.files kernel mason.common math namespaces
+prettyprint sequences sets sorting tools.test tools.time
+tools.vocabs words ;

 IN: mason.test
 
 : do-load ( -- )
 IN: mason.test
 
 : do-load ( -- )

diff --git a/extra/project-euler/project-euler.factor b/extra/project-euler/project-euler.factor
index 027e8fe50f20cf050f66a27f49162cee15c44508..f9fa0f4f1824d1f2e0146f508ce908544c9b0d46 100644 (file)
--- a/extra/project-euler/project-euler.factor
+++ b/extra/project-euler/project-euler.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007, 2008 Aaron Schaefer, Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2007, 2008 Aaron Schaefer, Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.

-USING: definitions io io.files kernel math math.parser
+USING: definitions io io.files io.pathnames kernel math math.parser

     prettyprint project-euler.ave-time sequences vocabs vocabs.loader
     project-euler.001 project-euler.002 project-euler.003 project-euler.004
     project-euler.005 project-euler.006 project-euler.007 project-euler.008
     prettyprint project-euler.ave-time sequences vocabs vocabs.loader
     project-euler.001 project-euler.002 project-euler.003 project-euler.004
     project-euler.005 project-euler.006 project-euler.007 project-euler.008

diff --git a/extra/shell/shell.factor b/extra/shell/shell.factor
index ae9b94ba0efaec56ec02b95f0370943cb1990dc8..d6c98ea203ab4b23e451bd6a43f6dc295b8f2c65 100644 (file)
--- a/extra/shell/shell.factor
+++ b/extra/shell/shell.factor
@@ -1,10 +1,8 @@
-

 USING: kernel parser words continuations namespaces debugger
 USING: kernel parser words continuations namespaces debugger

-       sequences combinators splitting prettyprint
-       system io io.files io.launcher io.encodings.utf8 io.pipes sequences.deep
-       accessors multi-methods newfx shell.parser
-       combinators.short-circuit eval environment ;
-
+sequences combinators splitting prettyprint system io io.files
+io.pathnames io.launcher io.directories io.encodings.utf8 io.pipes
+sequences.deep accessors multi-methods newfx shell.parser
+combinators.short-circuit eval environment ;

 IN: shell
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 IN: shell
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

diff --git a/extra/system-info/macosx/macosx.factor b/extra/system-info/macosx/macosx.factor
index a06c01b950425c7555c411bfa8d728935f49bba9..b51fd52995ae448b066274b5b3565273e424571a 100644 (file)
--- a/extra/system-info/macosx/macosx.factor
+++ b/extra/system-info/macosx/macosx.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.strings alien.syntax
 byte-arrays kernel namespaces sequences unix
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.strings alien.syntax
 byte-arrays kernel namespaces sequences unix

-system-info.backend system io.unix.backend io.encodings.utf8 ;
+system-info.backend system io.encodings.utf8 ;

 IN: system-info.macosx
 
 ! See /usr/include/sys/sysctl.h for constants
 IN: system-info.macosx
 
 ! See /usr/include/sys/sysctl.h for constants

diff --git a/extra/tar/tar.factor b/extra/tar/tar.factor
index e3c14854d3b29aa861679fd1533858766645ab0d..132e401f16159f2685c260d2a480c34e8afb0921 100755 (executable)
--- a/extra/tar/tar.factor
+++ b/extra/tar/tar.factor
@@ -1,6 +1,7 @@
-USING: combinators io io.files io.streams.string kernel math
-math.parser continuations namespaces pack prettyprint sequences
-strings system tools.hexdump io.encodings.binary summary accessors
+USING: combinators io io.files io.files.links io.directories
+io.pathnames io.streams.string kernel math math.parser
+continuations namespaces pack prettyprint sequences strings
+system tools.hexdump io.encodings.binary summary accessors

 io.backend symbols byte-arrays ;
 IN: tar
 
 io.backend symbols byte-arrays ;
 IN: tar
 

diff --git a/extra/update/backup/backup.factor b/extra/update/backup/backup.factor
index 0c7b442ffade93987ed3d68976b58bebbb2cf51d..77280031890b996f7afc9c4060904570d5591b18 100644 (file)
--- a/extra/update/backup/backup.factor
+++ b/extra/update/backup/backup.factor
@@ -1,6 +1,5 @@
-
-USING: namespaces debugger io.files bootstrap.image update.util ;
-
+USING: namespaces debugger io.files io.directories
+bootstrap.image update.util ;

 IN: update.backup
 
 : backup-boot-image ( -- )
 IN: update.backup
 
 : backup-boot-image ( -- )

diff --git a/extra/update/latest/latest.factor b/extra/update/latest/latest.factor
index 9546379223d5e0f07269d38f2262875d4155c77f..98d264d2272ec3cb215a20f4e2ec7652db4016c6 100644 (file)
--- a/extra/update/latest/latest.factor
+++ b/extra/update/latest/latest.factor
@@ -1,7 +1,5 @@
-
-USING: kernel namespaces system io.files bootstrap.image http.client
-       update update.backup update.util ;
-
+USING: kernel namespaces system io.files io.pathnames io.directories
+bootstrap.image http.client update update.backup update.util ;

 IN: update.latest
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 IN: update.latest
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

diff --git a/extra/update/update.factor b/extra/update/update.factor
index c6a5671345c95b8d0c3d63e9438cc955d6afff4f..ba09cc3f3d48c4d215e993ab53fc6f246ad56ce8 100644 (file)
--- a/extra/update/update.factor
+++ b/extra/update/update.factor
@@ -1,10 +1,5 @@
-
-USING: kernel system sequences io.files io.launcher bootstrap.image
-       http.client
-       update.util ;
-
-       ! builder.util builder.release.branch ;
-
+USING: kernel system sequences io.files io.directories
+io.pathnames io.launcher bootstrap.image http.client update.util ;

 IN: update
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 IN: update
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

diff --git a/extra/vpri-talk/vpri-talk.factor b/extra/vpri-talk/vpri-talk.factor
index 131b569a92ea1cc83055684c6766db8d14f320c8..35d8bb52ff63fd3c625ea55b53d12c751305e374 100644 (file)
--- a/extra/vpri-talk/vpri-talk.factor
+++ b/extra/vpri-talk/vpri-talk.factor
@@ -80,19 +80,19 @@ IN: vpri-talk
     { $slide "Object system"
         "New operation, existing types:"
         { $code
     { $slide "Object system"
         "New operation, existing types:"
         { $code

-            "GENERIC: perimiter ( shape -- n )"
+            "GENERIC: perimeter ( shape -- n )"

             ""
             ""

-            "M: rectangle perimiter"
+            "M: rectangle perimeter"

             "    [ width>> ] [ height>> ] bi + 2 * ;"
             ""
             "    [ width>> ] [ height>> ] bi + 2 * ;"
             ""

-            "M: circle perimiter"
+            "M: circle perimeter"

             "    radius>> 2 * pi * ;"
         }
     }
     { $slide "Object system"
         "We can compute perimiters now."
             "    radius>> 2 * pi * ;"
         }
     }
     { $slide "Object system"
         "We can compute perimiters now."

-        { $code "100 20 <rectangle> perimiter ." }
-        { $code "3 <circle> perimiter ." }
+        { $code "100 20 <rectangle> perimeter ." }
+        { $code "3 <circle> perimeter ." }

     }
     { $slide "Object system"
         "New type, extending existing operations:"
     }
     { $slide "Object system"
         "New type, extending existing operations:"


@@ -110,7 +110,7 @@ IN: vpri-talk
         { $code
             ": hypotenuse ( x y -- z ) [ sq ] bi@ + sqrt ;"
             ""
         { $code
             ": hypotenuse ( x y -- z ) [ sq ] bi@ + sqrt ;"
             ""

-            "M: triangle perimiter"
+            "M: triangle perimeter"

             "    [ base>> ] [ height>> ] bi"
             "    [ + ] [ hypotenuse ] 2bi + ;"
         }
             "    [ base>> ] [ height>> ] bi"
             "    [ + ] [ hypotenuse ] 2bi + ;"
         }


@@ -151,10 +151,10 @@ IN: vpri-talk
         "Libraries can define new parsing words"
     }
     { $slide "Example: float arrays"
         "Libraries can define new parsing words"
     }
     { $slide "Example: float arrays"

-        { $vocab-link "float-arrays" }
+        { $vocab-link "specialized-arrays.float" }

         "Avoids boxing and unboxing overhead"
         "Implemented with library code"
         "Avoids boxing and unboxing overhead"
         "Implemented with library code"

-        { $code "F{ 3.14 7.6 10.3 }" }
+        { $code "float-array{ 3.14 7.6 10.3 }" }

     }
     { $slide "Example: memoization"
         { "Memoization with " { $link POSTPONE: MEMO: } }
     }
     { $slide "Example: memoization"
         { "Memoization with " { $link POSTPONE: MEMO: } }

diff --git a/extra/webapps/help/help.factor b/extra/webapps/help/help.factor
index 96401b6afd65e73a0f9d3db54fbc6d68ef60e2bb..1c17e3214f17536f3345fa906943d8c7ab1324e0 100644 (file)
--- a/extra/webapps/help/help.factor
+++ b/extra/webapps/help/help.factor
@@ -2,7 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel accessors http.server.dispatchers
 http.server.static furnace.actions furnace.redirection urls
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel accessors http.server.dispatchers
 http.server.static furnace.actions furnace.redirection urls

-validators locals io.files html.forms html.components help.html ;
+validators locals io.files io.directories html.forms
+html.components help.html ;

 IN: webapps.help
 
 TUPLE: help-webapp < dispatcher ;
 IN: webapps.help
 
 TUPLE: help-webapp < dispatcher ;

diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index f2c0600ed5a31bf53e03ed44d85067963c39942f..07fbbe059601e05cfabaa93b75c21781f6ff7262 100644 (file)
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel hashtables calendar random assocs
 namespaces make splitting sequences sorting math.order present
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors kernel hashtables calendar random assocs
 namespaces make splitting sequences sorting math.order present

-io.files io.encodings.ascii
+io.files io.directories io.encodings.ascii

 syndication farkup
 html.components html.forms
 http.server
 syndication farkup
 html.components html.forms
 http.server

diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor
index d7fdfa2460f60027c5e2b9b859f70adfb2f2453d..302967969f150328dd95ec98537a0a71c9d98acf 100644 (file)
--- a/extra/websites/concatenative/concatenative.factor
+++ b/extra/websites/concatenative/concatenative.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 ! Copyright (c) 2008 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.

-USING: accessors kernel sequences assocs io.files io.sockets
-io.sockets.secure io.servers.connection
+USING: accessors kernel sequences assocs io.files io.pathnames
+io.sockets io.sockets.secure io.servers.connection

 namespaces db db.tuples db.sqlite smtp urls
 logging.insomniac
 html.templates.chloe
 namespaces db db.tuples db.sqlite smtp urls
 logging.insomniac
 html.templates.chloe