From: Slava Pestov Date: Mon, 15 Dec 2008 07:13:35 +0000 (-0600) Subject: Fixing load-everything for io.files split X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=e0f86889c7427637ba84fc705c8eed8769751aa7 Fixing load-everything for io.files split --- diff --git a/basis/ftp/client/client.factor b/basis/ftp/client/client.factor index 9c82cdbb50..ac21bb8f78 100644 --- 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 -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 @@ -104,7 +104,3 @@ ERROR: ftp-error got expected ; [ 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 04e96ed77a..6183165b3a 100644 --- 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. -USING: accessors combinators io.files kernel math.parser +USING: accessors combinators io.files.types kernel math.parser sequences splitting ; IN: ftp.client.listing-parser diff --git a/basis/ftp/server/server.factor b/basis/ftp/server/server.factor index ca27cbb784..d71179d599 100644 --- 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 -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 ; diff --git a/basis/help/handbook/handbook.factor b/basis/help/handbook/handbook.factor index cc36e9faab..69c2046834 100644 --- 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 "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" } diff --git a/basis/help/html/html.factor b/basis/help/html/html.factor index a9df0bea81..ec52264643 100644 --- 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 -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 diff --git a/basis/html/templates/chloe/chloe.factor b/basis/html/templates/chloe/chloe.factor index 73cc239a56..c3c1ec2b9e 100644 --- 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 -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 diff --git a/basis/http/server/static/static.factor b/basis/http/server/static/static.factor index 0bc644d019..b19bf2ae55 100644 --- a/basis/http/server/static/static.factor +++ b/basis/http/server/static/static.factor @@ -1,14 +1,11 @@ ! Copyright (C) 2004, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: calendar io io.files kernel math math.order -math.parser namespaces parser sequences strings -assocs hashtables debugger mime.types sorting logging -calendar.format accessors splitting -io.encodings.binary fry xml.entities destructors urls -html.elements html.templates.fhtml -http -http.server -http.server.responses +USING: calendar kernel math math.order math.parser namespaces +parser sequences strings assocs hashtables debugger mime.types +sorting logging calendar.format accessors splitting io io.files +io.files.info io.directories io.pathnames io.encodings.binary +fry xml.entities destructors urls html.elements +html.templates.fhtml http http.server http.server.responses http.server.redirection ; IN: http.server.static diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor index 10365e9785..17f8552c2b 100755 --- 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 -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 ; diff --git a/basis/io/files/unique/unique-docs.factor b/basis/io/files/unique/unique-docs.factor index bfde09dc48..681cd94a38 100644 --- 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 -io.files.unique.private math.parser io.files ; +io.pathnames io.directories math.parser io.files ; IN: io.files.unique HELP: temporary-path diff --git a/basis/io/files/unique/unique.factor b/basis/io/files/unique/unique.factor index 79afefa05d..02f4d6080c 100644 --- 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 -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 diff --git a/basis/io/monitors/recursive/recursive.factor b/basis/io/monitors/recursive/recursive.factor index a96c6f04f1..18fa62f6d6 100644 --- 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 -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 diff --git a/basis/mime/types/types.factor b/basis/mime/types/types.factor index bb0d674f23..ac5233c543 100644 --- 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. -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 ) diff --git a/basis/tools/files/files.factor b/basis/tools/files/files.factor index 7968639d47..54882800b0 100755 --- 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. -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 ( root -- responder ) diff --git a/core/io/pathnames/pathnames-docs.factor b/core/io/pathnames/pathnames-docs.factor index 21fd5b4b36..3ba864d471 100644 --- 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." } ; -ARTICLE: "pathnames" "Pathname manipulation" +ARTICLE: "io.pathnames" "Pathname manipulation" "Pathname manipulation:" { $subsection parent-directory } { $subsection file-name } diff --git a/extra/benchmark/mandel/mandel.factor b/extra/benchmark/mandel/mandel.factor index 64a673c8ec..c501c35c6a 100755 --- 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 -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 diff --git a/extra/benchmark/random/random.factor b/extra/benchmark/random/random.factor index 985c9a59b2..d2eb4cdab5 100755 --- 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 ) diff --git a/extra/benchmark/raytracer/raytracer.factor b/extra/benchmark/raytracer/raytracer.factor index 7fe46e9c36..c16e47846e 100755 --- 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 -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 diff --git a/extra/benchmark/reverse-complement/reverse-complement.factor b/extra/benchmark/reverse-complement/reverse-complement.factor index 665cbba30d..3298706da3 100755 --- 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 diff --git a/extra/benchmark/xml/xml.factor b/extra/benchmark/xml/xml.factor index a61293cd99..a32a98a133 100644 --- 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. -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 ( -- ) diff --git a/extra/bunny/model/model.factor b/extra/bunny/model/model.factor index 9dddd0d8cd..3e00191108 100755 --- a/extra/bunny/model/model.factor +++ b/extra/bunny/model/model.factor @@ -1,6 +1,6 @@ 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 ; diff --git a/extra/contributors/contributors.factor b/extra/contributors/contributors.factor index 4d6479db91..1879c52826 100755 --- 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. -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 ) diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor index eee33a13c8..2de80de4a4 100644 --- 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 -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 diff --git a/extra/geo-ip/geo-ip.factor b/extra/geo-ip/geo-ip.factor index aee53f24f5..c878306d7d 100644 --- 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. -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 ; diff --git a/extra/irc/ui/load/load.factor b/extra/irc/ui/load/load.factor index e6f4d07b56..6048d93711 100755 --- a/extra/irc/ui/load/load.factor +++ b/extra/irc/ui/load/load.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 William Schlieper ! See http://factorcode.org/license.txt for BSD license. -USING: kernel io.files parser editors sequences ; +USING: kernel io.files io.pathnames parser editors sequences ; IN: irc.ui.load diff --git a/extra/log-viewer/log-viewer.factor b/extra/log-viewer/log-viewer.factor index 7bc63d3e34..263454f769 100755 --- 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 ; +USING: kernel io io.files io.pathnames io.monitors io.encodings.utf8 ; IN: log-viewer : read-lines ( stream -- ) diff --git a/extra/mason/build/build.factor b/extra/mason/build/build.factor index 35070d8902..4d705610b4 100644 --- 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. -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 ( -- ) diff --git a/extra/mason/child/child.factor b/extra/mason/child/child.factor index 0c9669ed5a..5a3a0d6ceb 100644 --- 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. -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 ) diff --git a/extra/mason/cleanup/cleanup.factor b/extra/mason/cleanup/cleanup.factor index ae24f533d6..a2c087392a 100644 --- 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. -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 ( -- ) diff --git a/extra/mason/common/common.factor b/extra/mason/common/common.factor index 49f280fa84..ec0cbdbc9c 100644 --- 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 -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 -- ) diff --git a/extra/mason/config/config.factor b/extra/mason/config/config.factor index 9169fbf196..b1739d85fa 100644 --- 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. -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 diff --git a/extra/mason/help/help.factor b/extra/mason/help/help.factor index c9ca50f0c2..9a4e2be996 100644 --- 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. -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 ( -- ) diff --git a/extra/mason/mason.factor b/extra/mason/mason.factor index 4f9c8f65d3..299a2f4e1f 100644 --- 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. -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 -- ) diff --git a/extra/mason/release/archive/archive.factor b/extra/mason/release/archive/archive.factor index e76979d885..5ef424ad4f 100644 --- 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. -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 ) diff --git a/extra/mason/release/branch/branch.factor b/extra/mason/release/branch/branch.factor index 600b08c6b6..75ce828c28 100644 --- 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. -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 ; diff --git a/extra/mason/release/tidy/tidy.factor b/extra/mason/release/tidy/tidy.factor index fb931650d4..58046ce64c 100644 --- 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. -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 diff --git a/extra/mason/test/test.factor b/extra/mason/test/test.factor index b23ad19e5e..a15a96c63e 100644 --- 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. -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 ( -- ) diff --git a/extra/project-euler/project-euler.factor b/extra/project-euler/project-euler.factor index 027e8fe50f..f9fa0f4f18 100644 --- 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. -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 diff --git a/extra/shell/shell.factor b/extra/shell/shell.factor index ae9b94ba0e..d6c98ea203 100644 --- a/extra/shell/shell.factor +++ b/extra/shell/shell.factor @@ -1,10 +1,8 @@ - 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 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/extra/system-info/macosx/macosx.factor b/extra/system-info/macosx/macosx.factor index a06c01b950..b51fd52995 100644 --- 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 -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 diff --git a/extra/tar/tar.factor b/extra/tar/tar.factor index e3c14854d3..132e401f16 100755 --- 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 diff --git a/extra/update/backup/backup.factor b/extra/update/backup/backup.factor index 0c7b442ffa..7728003189 100644 --- 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 ( -- ) diff --git a/extra/update/latest/latest.factor b/extra/update/latest/latest.factor index 9546379223..98d264d227 100644 --- 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 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/extra/update/update.factor b/extra/update/update.factor index c6a5671345..ba09cc3f3d 100644 --- 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 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/extra/vpri-talk/vpri-talk.factor b/extra/vpri-talk/vpri-talk.factor index 131b569a92..35d8bb52ff 100644 --- 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 - "GENERIC: perimiter ( shape -- n )" + "GENERIC: perimeter ( shape -- n )" "" - "M: rectangle perimiter" + "M: rectangle perimeter" " [ width>> ] [ height>> ] bi + 2 * ;" "" - "M: circle perimiter" + "M: circle perimeter" " radius>> 2 * pi * ;" } } { $slide "Object system" "We can compute perimiters now." - { $code "100 20 perimiter ." } - { $code "3 perimiter ." } + { $code "100 20 perimeter ." } + { $code "3 perimeter ." } } { $slide "Object system" "New type, extending existing operations:" @@ -110,7 +110,7 @@ IN: vpri-talk { $code ": hypotenuse ( x y -- z ) [ sq ] bi@ + sqrt ;" "" - "M: triangle perimiter" + "M: triangle perimeter" " [ base>> ] [ height>> ] bi" " [ + ] [ hypotenuse ] 2bi + ;" } @@ -151,10 +151,10 @@ IN: vpri-talk "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" - { $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: } } diff --git a/extra/webapps/help/help.factor b/extra/webapps/help/help.factor index 96401b6afd..1c17e3214f 100644 --- 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 -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 ; diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor index f2c0600ed5..07fbbe0596 100644 --- 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 -io.files io.encodings.ascii +io.files io.directories io.encodings.ascii syndication farkup html.components html.forms http.server diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor index d7fdfa2460..302967969f 100644 --- 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. -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