Use run-resource for code distributed with Factor; run-file is for user code.

diff --git a/contrib/aim/load.factor b/contrib/aim/load.factor
index 635c31562a996f540a6a14b4d6924305be0d89f0..a6ab7a2a8f9441074dcc5843ca39f0dad9fbfd9b 100644 (file)
--- 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 6c87a3deafb3d0beb3cd0a81f45bb6ee21bb2406..f88b36495814bf0d7f919a3471845e4d80b32656 100644 (file)
--- 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 18c94a194da5b17122844aaab20f038e9fa4464d..64479e4236f29cc10f1e6fd8a26fc720b89a8b0c 100644 (file)
--- 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 48613bbbfcaa740f03c393286d8cd30c1203ee3c..b6eb218b2a84def5a807e100f203964b1c7e4f04 100644 (file)
--- 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 f2d92806a2921994cbc0d4dc3e9b03f11273e81c..eb6d67770aad1d2d216d45290948e913e465e77d 100644 (file)
--- 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.</p>
 <h1>Loading</h1>
-<p>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:</p>
+<p>The quickest way to get up and running with this library is to type the following into the listener:</p>
 <pre class="code">
-"load.factor" run-file
+"/contrib/concurrency/load.factor" run-resource
 USE: concurrency
 USE: concurrency-examples
 </pre>

diff --git a/contrib/concurrency/load.factor b/contrib/concurrency/load.factor
index cfbe26f4d259ded3cda09933722145f2bab31ef5..460f9ddce5b6449b82852427bf584eb335932679 100644 (file)
--- 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 ed24bd653f13f54cb7738ab847f598c22bd98c92..487469267518fa8517e59905c63570019b47ac61 100644 (file)
--- 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 8efa13cf2ee3908e1320d2cf7087d68c5b312a2e..4388253a78c796ae24497f12383915978c0899b2 100644 (file)
--- 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 623438cea34ff2de668706f654b9207559f8c92b..dd94925ac68118c581da0a64a7f1d679235e6337 100644 (file)
--- 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 a7a4020be16fd5ff5cf24634919984c8720c4a74..14f4b1b4e41f774a759dd07d9703cc3b2f7831af 100644 (file)
--- 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 ccf5b80e41c20f16a79071bce6302c0d974b7b9f..f068373e4796800076faa259256f58717dc59c6d 100644 (file)
--- 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 470c6de5007a3b413b6a545bbb18a2ed68cf2022..d772fa630d4133d32e388da89103863c0ef1282f 100644 (file)
--- 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 2e15f1c86e45f476dd3f71c10edbcf79f23248fd..0dd9674626759f98b177215cf259140d17e4e2db 100644 (file)
--- 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 a222d190d8d3d2682ee759ce1d99eebfce1bdc97..1a9c3e88bdec5faac6de7ec0c9213d65b753682d 100644 (file)
--- 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 2a80b829fe5da37fc67cbecc9b969ce156ad887f..43d4d45176d96ef4b5b81a812f9758846016b97f 100644 (file)
--- 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 a3f9d22f832ad27cb23d655b04cba9a9a17156cb..1d7b463296cc6b0c965154b90b493b4389aece56 100644 (file)
--- a/contrib/sqlite/tuple-db.html
+++ b/contrib/sqlite/tuple-db.html
@@ -51,19 +51,16 @@ following command:</p>
 <pre class="code">
 ./f boot.image.le32 -libraries:sqlite:name=libsqlite3.so
 </pre>
-<p>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:</p>
+<p>The quickest way to get up and running with this library is to type the following into the listener:</p>
 <pre class="code">
-"sqlite.factor" run-file
-"tuple-db.factor" run-file
+"/contrib/sqlite/load.factor" run-resource
 USE: sqlite
 USE: tuple-db
 </pre>
 <p>Some simple tests can be run to check that everything is working
 ok:</p>
 <pre class="code">
-"tuple-db-tests.factor" run-file
+"/contrib/sqlite/tuple-db-tests.factor" run-resource
 </pre>
 <h1>Basic Usage</h1>
 <p>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 c24c6a1984bca9580ceef8e3815c2299a8a2fb18..c1b7f04c1a4cfea6c57116eee07a9faf06a70f2e 100644 (file)
--- 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 3a19182e3a82da72f35c2c9a459345bfdda29b8c..3a039062a3a1c72302ca2859882c2944aa4b71ce 100644 (file)
--- a/contrib/win32/load.factor
+++ b/contrib/win32/load.factor
@@ -11,4 +11,4 @@ USING: alien compiler kernel parser sequences words ;
     "types"\r
     "kernel32"\r
     "user32"\r
-} [ "contrib/win32/" swap ".factor" append3 run-file ] each\r
+} [ "/contrib/win32/" swap ".factor" append3 run-resource ] each\r

diff --git a/contrib/x11/examples/lindenmayer/load.factor b/contrib/x11/examples/lindenmayer/load.factor
index 7432cf64533d34cc3804261f3bd1132b767df1d3..66326d6ab78c7d87b61245eeb40985867b899c53 100644 (file)
--- 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 953a8412e473a792c609d42fff15c92bd7ecbbeb..9c5307ac5c3f3896be29be8a3cff2dfba9da102f 100644 (file)
--- 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 053e0e8fd759ea7ace6704db7ae98c9e5a254f6d..e105e90bd98da14b112b1f7b0c38766bcb980f08 100644 (file)
--- 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 8f247a1c9d44172c2c514103797892586820be73..29d9bfb23770180548398044191ede4e835358ac 100644 (file)
--- 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:
     </body>
   </html>
 
-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 1c9b13d4f6e9f5e8853118192ad4546db2646404..57643aa79c81a1efa631e093aa71d66229ec0621 100644 (file)
--- 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