factor: system:image -> image-path, like vm-path. image is all over the place png...

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 98391357e068173d594e0be98fd76601d1f788d8..95222ada286f50721c7349d0705fb44a939faf11 100644 (file)
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -129,14 +129,14 @@ DEFER: ?make-staging-image
     config [
         bootstrap-profile :> profile
         vocab "vocab-manifest-" prepend temp-file :> manifest-file
-        image vocab manifest-file profile deploy-command-line :> flags
+        image-path vocab manifest-file profile deploy-command-line :> flags
         profile ?make-staging-image
         vm-path flags run-factor
         manifest-file parse-vocab-manifest-file
     ] with-variables ;
 
-:: make-deploy-image-executable ( vm-path image vocab config -- manifest )
-    vm-path image vocab config make-deploy-image
-    image vm-path embed-image ;
+:: make-deploy-image-executable ( vm image vocab config -- manifest )
+    vm image vocab config make-deploy-image
+    image vm embed-image ;
 
 HOOK: deploy* os ( vocab -- )

diff --git a/basis/tools/deploy/embed/embed.factor b/basis/tools/deploy/embed/embed.factor
index da3c1dca94787bf9f277db675cd2515b6563fd34..b416d46c13813bd9d7c48961110afdb75adcf435 100644 (file)
--- a/basis/tools/deploy/embed/embed.factor
+++ b/basis/tools/deploy/embed/embed.factor
@@ -7,7 +7,7 @@ IN: tools.deploy.embed
 :: embed-image ( image executable -- )
     executable binary <file-appender> [| out |
         out stream-tell :> offset
-        image binary <file-reader> [| in |
+        image-path binary <file-reader> [| in |
             in out stream-copy*
         ] with-disposal
         image-magic uintptr_t <ref> out stream-write

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 4d7f669322cb67ebc52f16e1d379128d276d9343..8cc79a1c1d2a6eea97b195e3e93a0c3b3e4b22c9 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -399,7 +399,7 @@ IN: tools.deploy.shaker
             output-stream
             error-stream
             vm-path
-            image
+            image-path
             current-directory
         } %
 

diff --git a/basis/tools/deploy/test/18/18.factor b/basis/tools/deploy/test/18/18.factor
index 0676376701edcd7b588ad268b164fd206e25092c..850161b7cb6dad850255bc3f352850f8ae3c6189 100644 (file)
--- a/basis/tools/deploy/test/18/18.factor
+++ b/basis/tools/deploy/test/18/18.factor
@@ -3,6 +3,6 @@
 USING: accessors io.streams.c math.parser system ;
 IN: tools.deploy.test.18
 
-: main ( -- ) image show ;
+: main ( -- ) image-path show ;
 
 MAIN: main

diff --git a/basis/ui/backend/cocoa/tools/tools.factor b/basis/ui/backend/cocoa/tools/tools.factor
index be8b2bb1c37b821dac2b555553f4843ee63447c1..860ffe767be3da69e8c59bdc0c95f6ebea951bc6 100644 (file)
--- a/basis/ui/backend/cocoa/tools/tools.factor
+++ b/basis/ui/backend/cocoa/tools/tools.factor
@@ -18,7 +18,7 @@ IN: ui.backend.cocoa.tools
     open-panel [ listener-run-files ] when* ;
 
 : menu-save-image ( -- )
-    image save-panel [ save-image ] when* ;
+    image-path save-panel [ save-image ] when* ;
 
 ! Handle Open events from the Finder
 CLASS: FactorWorkspaceApplicationDelegate < FactorApplicationDelegate

diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 1bb94a7b72a745bbf2ce207664a59af6c2eeee19..589378a309aa067872fb801235054f70a998430b 100644 (file)
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -48,7 +48,7 @@ load-help? off
             run-file
         ] [
             "Cannot find " write write "." print
-            "Please move " write image write " into the same directory as the Factor sources," print
+            "Please move " write image-path write " into the same directory as the Factor sources," print
             "and try again." print
             1 (exit)
         ] if

diff --git a/core/io/files/files-tests.factor b/core/io/files/files-tests.factor
index 71bfeab9d8a39409bac320f7f61f272a032fe2eb..2308eceeb2c0648c7d38dfe1b8faacb987c7f52f 100644 (file)
--- a/core/io/files/files-tests.factor
+++ b/core/io/files/files-tests.factor
@@ -63,7 +63,7 @@ IN: io.files.tests
 ] unit-test
 
 { } [
-    image binary [
+    image-path binary [
         10 [ 65536 read drop ] times
     ] with-file-reader
 ] unit-test
@@ -135,7 +135,7 @@ CONSTANT: pt-array-1
 
 ! Test EOF behavior
 { 10 } [
-    image binary [
+    image-path binary [
         0 read drop
         10 read length
     ] with-file-reader

diff --git a/core/io/files/files.factor b/core/io/files/files.factor
index c4c7fd66d7674320d455edca084db5403e9fbb0d..4e551f33b3a94b307f73f10a064617b6fdeb2268 100644 (file)
--- a/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@ -79,11 +79,11 @@ PRIVATE>
 : init-resource-path ( -- )
     OBJ-ARGS special-object
     [ utf8 alien>string "-resource-path=" ?head [ drop f ] unless ] map-find drop
-    [ image parent-directory ] unless* "resource-path" set-global ;
+    [ image-path parent-directory ] unless* "resource-path" set-global ;
 
 [
     cwd current-directory set-global
-    OBJ-IMAGE special-object alien>native-string cwd prepend-path \ image set-global
+    OBJ-IMAGE special-object alien>native-string cwd prepend-path \ image-path set-global
     OBJ-EXECUTABLE special-object alien>native-string cwd prepend-path \ vm-path set-global
     init-resource-path
 ] "io.files" add-startup-hook

diff --git a/core/io/pathnames/pathnames-docs.factor b/core/io/pathnames/pathnames-docs.factor
index 207a1a0518ad0e623a5e06dfb924de8d59909df1..0418bbb4324fab7ccdd1e49676fb3d2530f6526c 100644 (file)
--- a/core/io/pathnames/pathnames-docs.factor
+++ b/core/io/pathnames/pathnames-docs.factor
@@ -129,7 +129,7 @@ HELP: home
 } ;
 
 ARTICLE: "io.pathnames.special" "Special pathnames"
-"If a pathname begins with " { $snippet "resource:" } ", it is resolved relative to the directory containing the current image (see " { $link image } ")."
+"If a pathname begins with " { $snippet "resource:" } ", it is resolved relative to the directory containing the current image (see " { $link image-path } ")."
 $nl
 "If a pathname begins with " { $snippet "vocab:" } ", then it will be searched for in all current vocabulary roots (see " { $link "add-vocab-roots" } ")."
 $nl

diff --git a/core/memory/memory.factor b/core/memory/memory.factor
index aa7e33a81c734340133cdd8fa84c33beb255ae61..8b1f1a2c63ddb51e9252d37796db9e5eb11a8598 100644 (file)
--- a/core/memory/memory.factor
+++ b/core/memory/memory.factor
@@ -27,4 +27,4 @@ PRIVATE>
 : save-image-and-exit ( path -- )
     normalize-path saving-path t (save-image) ;
 
-: save ( -- ) image save-image ;
+: save ( -- ) image-path save-image ;

diff --git a/core/system/system-docs.factor b/core/system/system-docs.factor
index cddccb155e26c723d80a7b92ba08e781603897bc..cee27e05d342cfecd5b2085dc87149c0210c8adf 100644 (file)
--- a/core/system/system-docs.factor
+++ b/core/system/system-docs.factor
@@ -11,7 +11,7 @@ ARTICLE: "system" "System interface"
 "Getting the path to the Factor VM and image:"
 { $subsections
     vm-path
-    image
+    image-path
 }
 "Getting a monotonically increasing nanosecond count:"
 { $subsections nano-count }
@@ -72,7 +72,7 @@ HELP: nano-count
 { $description "Outputs a monotonically increasing count of nanoseconds elapsed since an arbitrary starting time. The difference of two calls to this word allows timing. This word is unaffected by system clock changes." }
 { $notes "This is a low-level word. The " { $vocab-link "tools.time" } " vocabulary defines words to time code execution time." } ;
 
-HELP: image
+HELP: image-path
 { $values { "path" "a pathname string" } }
 { $description "Outputs the pathname of the currently running Factor image." } ;
 

diff --git a/core/system/system.factor b/core/system/system.factor
index 0782a0c01978d33d1c3509bc2abc5acf276a404c..8acb34b2f99667086d11c9f5d936c5f60b178b32 100644 (file)
--- a/core/system/system.factor
+++ b/core/system/system.factor
@@ -61,7 +61,7 @@ CONSTANT: string>os-hash H{
 
 PRIVATE>
 
-: image ( -- path ) \ image get-global ;
+: image-path ( -- path ) \ image-path get-global ;
 
 : vm-path ( -- path ) \ vm-path get-global ;
 

diff --git a/extra/contributors/contributors.factor b/extra/contributors/contributors.factor
index 7e4287b4d07cd709cd69a1f1674ef3b7ab07894b..fb86081e7e6947954f007c7d0e60c1b9f696e12d 100644 (file)
--- a/extra/contributors/contributors.factor
+++ b/extra/contributors/contributors.factor
@@ -6,7 +6,7 @@ system ;
 IN: contributors
 
 : changelog ( -- authors )
-    image parent-directory [
+    image-path parent-directory [
         "git log --no-merges --pretty=format:%an"
         ascii [ lines ] with-process-reader
     ] with-directory ;

diff --git a/extra/update/latest/latest.factor b/extra/update/latest/latest.factor
index 88e634743d8e233fa403066c57027b3d6138f094..fea50f54953879315435531a66250d2cbab47c62 100644 (file)
--- a/extra/update/latest/latest.factor
+++ b/extra/update/latest/latest.factor
@@ -5,7 +5,7 @@ IN: update.latest
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : git-pull-master ( -- )
-  image parent-directory
+  image-path parent-directory
     [
       { "git" "pull" "git://factorcode.org/git/factor.git" "master" }
       run-command
@@ -22,7 +22,7 @@ IN: update.latest
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : rebuild-latest ( -- )
-  image parent-directory
+  image-path parent-directory
     [
       backup
       download-latest-image
@@ -35,7 +35,7 @@ IN: update.latest
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : update-latest ( -- )
-  image parent-directory
+  image-path parent-directory
     [
       git-id
       git-pull-master

diff --git a/extra/update/update.factor b/extra/update/update.factor
index 6a31f20e1343b46e574d62fae7db1119cc78c901..d02726433ad8fdc94e6b9612a6560144826ab791 100644 (file)
--- a/extra/update/update.factor
+++ b/extra/update/update.factor
@@ -9,7 +9,7 @@ IN: update
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : git-pull-clean ( -- )
-    image parent-directory [
+    image-path parent-directory [
         { "git" "pull" "git://factorcode.org/git/factor.git" branch-name }
         run-command
     ] with-directory ;
@@ -31,7 +31,7 @@ IN: update
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : rebuild ( -- )
-    image parent-directory [
+    image-path parent-directory [
         download-clean-image
         make-clean
         make
@@ -41,7 +41,7 @@ IN: update
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 : update ( -- )
-    image parent-directory [
+    image-path parent-directory [
         git-id
         git-pull-clean
         git-id