diff --git a/contrib/aim/load.factor b/contrib/aim/load.factor index 635c31562a..a6ab7a2a8f 100644 --- a/contrib/aim/load.factor +++ b/contrib/aim/load.factor @@ -1,9 +1,9 @@ IN: scratchpad USING: kernel parser sequences words compiler ; -"contrib/crypto/load.factor" run-file +"/contrib/crypto/load.factor" run-resource { "net-bytes" "aim" -} [ "contrib/aim/" swap ".factor" append3 run-file ] each +} [ "/contrib/aim/" swap ".factor" append3 run-resource ] each diff --git a/contrib/cairo/cairo_simple.factor b/contrib/cairo/cairo_simple.factor index 6c87a3deaf..f88b364958 100644 --- a/contrib/cairo/cairo_simple.factor +++ b/contrib/cairo/cairo_simple.factor @@ -12,8 +12,7 @@ ! Then, start Factor as usual (./f factor.image) and enter these ! at the listener: ! -! "cairo.factor" run-file -! "cairo_sdl.factor" run-file +! "/contrib/cairo/load.factor" run-resource ! "cairo_simple.factor" run-file IN: cairo-simple diff --git a/contrib/cairo/cairo_text.factor b/contrib/cairo/cairo_text.factor index 18c94a194d..64479e4236 100644 --- a/contrib/cairo/cairo_text.factor +++ b/contrib/cairo/cairo_text.factor @@ -12,8 +12,7 @@ ! Then, start Factor as usual (./f factor.image) and enter these ! at the listener: ! -! "cairo.factor" run-file -! "cairo_sdl.factor" run-file +! "/contrib/cairo/load.factor" run-resource ! "cairo_text.factor" run-file IN: cairo-text diff --git a/contrib/cairo/load.factor b/contrib/cairo/load.factor index 48613bbbfc..b6eb218b2a 100644 --- a/contrib/cairo/load.factor +++ b/contrib/cairo/load.factor @@ -10,4 +10,4 @@ USING: alien kernel parser compiler words sequences ; { "cairo" "cairo_sdl" -} [ "contrib/cairo/" swap ".factor" append3 run-file ] each +} [ "/contrib/cairo/" swap ".factor" append3 run-resource ] each diff --git a/contrib/concurrency/concurrency.html b/contrib/concurrency/concurrency.html index f2d92806a2..eb6d67770a 100644 --- a/contrib/concurrency/concurrency.html +++ b/contrib/concurrency/concurrency.html @@ -19,11 +19,9 @@ processes can share data via Factor's mutable data structures it is not recommended as the use of shared state concurrency is often a cause of problems.

Loading

-

The quickest way to get up and running with this library is to -change to the 'concurrency' directory and run Factor. Then execute the -following commands:

+

The quickest way to get up and running with this library is to type the following into the listener:

-"load.factor" run-file
+"/contrib/concurrency/load.factor" run-resource
 USE: concurrency
 USE: concurrency-examples
 
diff --git a/contrib/concurrency/load.factor b/contrib/concurrency/load.factor index cfbe26f4d2..460f9ddce5 100644 --- a/contrib/concurrency/load.factor +++ b/contrib/concurrency/load.factor @@ -1,10 +1,10 @@ IN: scratchpad USING: kernel parser compiler words sequences ; -"contrib/dlists.factor" run-file -"contrib/math/load.factor" run-file +"/contrib/dlists.factor" run-resource +"/contrib/math/load.factor" run-resource { "concurrency" "concurrency-examples" -} [ "contrib/concurrency/" swap ".factor" append3 run-file ] each +} [ "/contrib/concurrency/" swap ".factor" append3 run-resource ] each diff --git a/contrib/cont-responder/load.factor b/contrib/cont-responder/load.factor index ed24bd653f..4874692675 100644 --- a/contrib/cont-responder/load.factor +++ b/contrib/cont-responder/load.factor @@ -1,8 +1,8 @@ IN: scratchpad USING: words kernel parser sequences io compiler ; -"contrib/httpd/load.factor" run-file -"contrib/parser-combinators/load.factor" run-file +"/contrib/httpd/load.factor" run-resource +"/contrib/parser-combinators/load.factor" run-resource { "cont-examples" @@ -13,4 +13,4 @@ USING: words kernel parser sequences io compiler ; "eval-responder" "live-updater-responder" "cont-testing" -} [ "contrib/cont-responder/" swap ".factor" append3 run-file ] each +} [ "/contrib/cont-responder/" swap ".factor" append3 run-resource ] each diff --git a/contrib/crypto/load.factor b/contrib/crypto/load.factor index 8efa13cf2e..4388253a78 100644 --- a/contrib/crypto/load.factor +++ b/contrib/crypto/load.factor @@ -1,10 +1,10 @@ IN: scratchpad USING: kernel parser sequences words compiler ; -"contrib/math/load.factor" run-file +"/contrib/math/load.factor" run-resource { "common" "md5" "sha1" -} [ "contrib/crypto/" swap ".factor" append3 run-file ] each +} [ "/contrib/crypto/" swap ".factor" append3 run-resource ] each diff --git a/contrib/httpd/load.factor b/contrib/httpd/load.factor index 623438cea3..dd94925ac6 100644 --- a/contrib/httpd/load.factor +++ b/contrib/httpd/load.factor @@ -20,4 +20,4 @@ USING: words kernel parser sequences io compiler ; "test/http-client" "test/httpd" "test/url-encoding" -} [ "contrib/httpd/" swap ".factor" append3 run-file ] each +} [ "/contrib/httpd/" swap ".factor" append3 run-resource ] each diff --git a/contrib/load.factor b/contrib/load.factor index a7a4020be1..14f4b1b4e4 100644 --- a/contrib/load.factor +++ b/contrib/load.factor @@ -6,7 +6,7 @@ USING: alien compiler kernel memory parser sequences words ; "coroutines" "dlists" "splay-trees" -} [ "contrib/" swap ".factor" append3 run-file clear ] each +} [ "/contrib/" swap ".factor" append3 run-resource clear ] each { "cairo" "math" @@ -23,4 +23,4 @@ USING: alien compiler kernel memory parser sequences words ; "parser-combinators" "cont-responder" "space-invaders" -} [ "contrib/" swap "/load.factor" append3 run-file clear ] each +} [ "/contrib/" swap "/load.factor" append3 run-resource clear ] each diff --git a/contrib/math/load.factor b/contrib/math/load.factor index ccf5b80e41..f068373e47 100644 --- a/contrib/math/load.factor +++ b/contrib/math/load.factor @@ -10,4 +10,4 @@ USING: kernel parser sequences words compiler ; "matrices" "statistics" "numerical-integration" -} [ "contrib/math/" swap ".factor" append3 run-file ] each +} [ "/contrib/math/" swap ".factor" append3 run-resource ] each diff --git a/contrib/parser-combinators/load.factor b/contrib/parser-combinators/load.factor index 470c6de500..d772fa630d 100644 --- a/contrib/parser-combinators/load.factor +++ b/contrib/parser-combinators/load.factor @@ -6,4 +6,4 @@ USING: kernel parser sequences words compiler ; "parser-combinators" "lazy-examples" "tests" -} [ "contrib/parser-combinators/" swap ".factor" append3 run-file ] each +} [ "/contrib/parser-combinators/" swap ".factor" append3 run-resource ] each diff --git a/contrib/postgresql/load.factor b/contrib/postgresql/load.factor index 2e15f1c86e..0dd9674626 100644 --- a/contrib/postgresql/load.factor +++ b/contrib/postgresql/load.factor @@ -8,4 +8,4 @@ USING: alien compiler kernel parser sequences words ; "postgresql" "postgresql-test" ! "private" ! Put your password in this file -} [ "contrib/postgresql/" swap ".factor" append3 run-file ] each +} [ "/contrib/postgresql/" swap ".factor" append3 run-resource ] each diff --git a/contrib/space-invaders/load.factor b/contrib/space-invaders/load.factor index a222d190d8..1a9c3e88bd 100644 --- a/contrib/space-invaders/load.factor +++ b/contrib/space-invaders/load.factor @@ -1,9 +1,9 @@ IN: scratchpad USING: kernel parser compiler words sequences io ; -"contrib/parser-combinators/load.factor" run-file +"/contrib/parser-combinators/load.factor" run-resource { "cpu-8080" "space-invaders" -} [ "contrib/space-invaders/" swap ".factor" append3 run-file ] each +} [ "/contrib/space-invaders/" swap ".factor" append3 run-resource ] each diff --git a/contrib/sqlite/load.factor b/contrib/sqlite/load.factor index 2a80b829fe..43d4d45176 100644 --- a/contrib/sqlite/load.factor +++ b/contrib/sqlite/load.factor @@ -8,4 +8,4 @@ USING: kernel alien parser compiler words sequences ; "tuple-db" "test" "tuple-db-tests" -} [ "contrib/sqlite/" swap ".factor" append3 run-file ] each +} [ "/contrib/sqlite/" swap ".factor" append3 run-resource ] each diff --git a/contrib/sqlite/tuple-db.html b/contrib/sqlite/tuple-db.html index a3f9d22f83..1d7b463296 100644 --- a/contrib/sqlite/tuple-db.html +++ b/contrib/sqlite/tuple-db.html @@ -51,19 +51,16 @@ following command:

 ./f boot.image.le32 -libraries:sqlite:name=libsqlite3.so
 
-

The quickest way to get up and running with this library is to -change to the 'sqlite' directory and run Factor. Then execute the -following commands:

+

The quickest way to get up and running with this library is to type the following into the listener:

-"sqlite.factor" run-file
-"tuple-db.factor" run-file
+"/contrib/sqlite/load.factor" run-resource
 USE: sqlite
 USE: tuple-db
 

Some simple tests can be run to check that everything is working ok:

-"tuple-db-tests.factor" run-file
+"/contrib/sqlite/tuple-db-tests.factor" run-resource
 

Basic Usage

This library can be used for storing simple Factor tuples in a diff --git a/contrib/units/load.factor b/contrib/units/load.factor index c24c6a1984..c1b7f04c1a 100644 --- a/contrib/units/load.factor +++ b/contrib/units/load.factor @@ -5,4 +5,4 @@ USING: kernel parser sequences words compiler ; "dimensioned" "si-units" "constants" -} [ "contrib/units/" swap ".factor" append3 run-file ] each +} [ "/contrib/units/" swap ".factor" append3 run-resource ] each diff --git a/contrib/win32/load.factor b/contrib/win32/load.factor index 3a19182e3a..3a039062a3 100644 --- a/contrib/win32/load.factor +++ b/contrib/win32/load.factor @@ -11,4 +11,4 @@ USING: alien compiler kernel parser sequences words ; "types" "kernel32" "user32" -} [ "contrib/win32/" swap ".factor" append3 run-file ] each +} [ "/contrib/win32/" swap ".factor" append3 run-resource ] each diff --git a/contrib/x11/examples/lindenmayer/load.factor b/contrib/x11/examples/lindenmayer/load.factor index 7432cf6453..66326d6ab7 100644 --- a/contrib/x11/examples/lindenmayer/load.factor +++ b/contrib/x11/examples/lindenmayer/load.factor @@ -1,5 +1,5 @@ USING: kernel parser words compiler sequences ; -"lindenmayer.factor" run-file +"/contrib/x11/examples/lindenmayer/lindenmayer.factor" run-resource "lindenmayer" words [ try-compile ] each clear diff --git a/contrib/x11/load.factor b/contrib/x11/load.factor index 953a8412e4..9c5307ac5c 100644 --- a/contrib/x11/load.factor +++ b/contrib/x11/load.factor @@ -11,6 +11,6 @@ USING: alien compiler kernel parser sequences words ; "concurrent-widgets" "glx" "gl" -} [ "contrib/x11/" swap ".factor" append3 run-file ] each +} [ "/contrib/x11/" swap ".factor" append3 run-resource ] each ! { "xlib" "x11" } [ words [ try-compile ] each ] each diff --git a/contrib/x11/load2.factor b/contrib/x11/load2.factor index 053e0e8fd7..e105e90bd9 100644 --- a/contrib/x11/load2.factor +++ b/contrib/x11/load2.factor @@ -8,7 +8,7 @@ USING: kernel alien parser sequences words compiler ; "keysymdef.factor" "x-events.factor" "glx.factor" -] [ "contrib/x11/" swap append run-file ] each +] [ "/contrib/x11/" swap append run-resource ] each "x11" words [ try-compile ] each "xlib" words [ try-compile ] each diff --git a/doc/cont-responder-tutorial.txt b/doc/cont-responder-tutorial.txt index 8f247a1c9d..29d9bfb237 100644 --- a/doc/cont-responder-tutorial.txt +++ b/doc/cont-responder-tutorial.txt @@ -582,7 +582,7 @@ The 'cont-testing.factor' file (in the contrib/cont-responder directory) contains some simple words that maintains this state for you in such a way that you can test the words from the console: - "cont-testing.factor" run-file + "/contrib/cont-testing/load.factor" run-resource For this example we'll call the 'subroutine-example1' responder from above. First we need to put a 'testing state' object on the stack. All @@ -671,4 +671,4 @@ Now we submit the post data along to the 'action' url: -As you can see the post data was sent correctly. \ No newline at end of file +As you can see the post data was sent correctly. diff --git a/examples/factoroids/load.factor b/examples/factoroids/load.factor index 1c9b13d4f6..57643aa79c 100644 --- a/examples/factoroids/load.factor +++ b/examples/factoroids/load.factor @@ -1,13 +1,15 @@ USING: io parser ; -"examples/factoroids/utils.factor" run-file -"examples/factoroids/models.factor" run-file -"examples/factoroids/bodies.factor" run-file -"examples/factoroids/actors.factor" run-file -"examples/factoroids/projectiles.factor" run-file -"examples/factoroids/ai.factor" run-file -"examples/factoroids/input.factor" run-file -"examples/factoroids/factoroids.factor" run-file +{ + "utils" + "models" + "bodies" + "actors" + "projectiles" + "ai" + "input" + "factoroids" +} [ "/examples/factoroids/" swap ".factor" append3 run-resource ] each "To play Factoroids, enter the following in the listener:" print terpri