factor: arch -> arch-name. fix breakage caused by other patch.

diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
index 12e5e77075d3690907e574be6619b8667e3b7250..dda459e5956374ef8b09e6c95036be6733b526cf 100755 (executable)
--- a/basis/bootstrap/image/image.factor
+++ b/basis/bootstrap/image/image.factor
@@ -13,22 +13,22 @@ sequences sequences.private source-files strings system vectors
 vocabs words ;
 IN: bootstrap.image
 
-: arch ( os cpu -- arch )
+: arch-name ( os cpu -- arch )
     2dup [ windows? ] [ ppc? ] bi* or [
       [ drop unix ] dip
     ] unless
     [ name>> ] bi@ "-" glue ;
 
-: my-arch ( -- arch )
-    os cpu arch ;
+: my-arch-name ( -- arch )
+    os cpu arch-name ;
 
 : boot-image-name ( arch -- string )
     "boot." ".image" surround ;
 
 : my-boot-image-name ( -- string )
-    my-arch boot-image-name ;
+    my-arch-name boot-image-name ;
 
-CONSTANT: image-strings
+CONSTANT: image-names
     {
         "windows-x86.32" "unix-x86.32"
         "windows-x86.64" "unix-x86.64"
@@ -596,7 +596,7 @@ PRIVATE>
     ] with-variables ;
 
 : make-images ( -- )
-    image-strings [ make-image ] each ;
+    image-names [ make-image ] each ;
 
 : make-my-image ( -- )
-    my-arch make-image ;
+    my-arch-name make-image ;

diff --git a/basis/bootstrap/image/upload/upload.factor b/basis/bootstrap/image/upload/upload.factor
index 4b263266246f5e1a782f23bac7e27e837fe83156..61fc31024bfbffdb81975041f5050b94d7d72961 100644 (file)
--- a/basis/bootstrap/image/upload/upload.factor
+++ b/basis/bootstrap/image/upload/upload.factor
@@ -23,7 +23,7 @@ SYMBOL: build-images-destination
 : checksums-path ( -- temp ) "checksums.txt" temp-file ;
 
 : boot-image-names ( -- seq )
-    images [ boot-image-name ] map ;
+    image-names [ boot-image-name ] map ;
 
 : compute-checksums ( -- )
     checksums-path ascii [

diff --git a/basis/compiler/tests/linkage-errors.factor b/basis/compiler/tests/linkage-errors.factor
index 318b229425c835c28b8373f7a88c39cc53b0f251..85b4624df538e3557406a108080694d07e87ac35 100644 (file)
--- a/basis/compiler/tests/linkage-errors.factor
+++ b/basis/compiler/tests/linkage-errors.factor
@@ -1,6 +1,6 @@
 USING: tools.test namespaces assocs alien.syntax kernel
 compiler.errors accessors alien alien.c-types alien.strings
-debugger literals kernel.private ;
+debugger literals kernel.private alien.libraries ;
 IN: compiler.tests.linkage-errors
 
 ! Regression: calling an undefined function would raise a protection fault

diff --git a/basis/html/streams/streams-tests.factor b/basis/html/streams/streams-tests.factor
index 29cb81e8a5cb3c469c6a176474693db111408570..6c03d16178e35c8f5d379b3d5840c7c32f9e17f2 100644 (file)
--- a/basis/html/streams/streams-tests.factor
+++ b/basis/html/streams/streams-tests.factor
@@ -66,7 +66,7 @@ M: funky url-of "http://www.funky-town.com/" swap town>> append ;
 { "<img src=\"/icons/class-word.tiff\"/>" } [
     [
         "text"
-        { { image "vocab:definitions/icons/class-word.tiff" } }
+        { { image-style "vocab:definitions/icons/class-word.tiff" } }
         format
     ] make-html-string
 ] unit-test

diff --git a/basis/io/launcher/unix/unix-tests.factor b/basis/io/launcher/unix/unix-tests.factor
index 83b175f0130961dd222f85ab17ab3f3297ced705..da2fb3c5bbe4878b886d6a419760bd121963d751 100644 (file)
--- a/basis/io/launcher/unix/unix-tests.factor
+++ b/basis/io/launcher/unix/unix-tests.factor
@@ -8,7 +8,7 @@ threads tools.test unix unix.process ;
 IN: io.launcher.unix.tests
 
 : arch-temp-file ( str -- str' )
-    "-" my-arch 3append temp-file ;
+    "-" my-arch-name 3append temp-file ;
 
 { } [
     [ "launcher-test-1" arch-temp-file delete-file ] ignore-errors

diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
index 8c21fafbb299dc7245447a8a7f07544812248589..1523cd5f9838ad3c435110e6d62e02c623b4b3dd 100644 (file)
--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
@@ -62,13 +62,13 @@ ERROR: can't-deploy-library-file library ;
     ] { } make ;
 
 : staging-image-name ( profile -- name )
-    "-" join "." my-arch 3append
+    "-" join "." my-arch-name 3append
     "staging." ".image" surround cache-file ;
 
 : delete-staging-images ( -- )
     cache-directory [
         [ "staging." head? ] filter
-        "." my-arch ".image" 3append [ tail? ] curry filter
+        "." my-arch-name ".image" 3append [ tail? ] curry filter
         [ delete-file ] each
     ] with-directory-files ;
 

diff --git a/basis/tools/deploy/test/test.factor b/basis/tools/deploy/test/test.factor
index 54200225af349de5e2814712fd16f9972958ffd7..05e16ca10f1581fc31e132731eeca937dd785de9 100644 (file)
--- a/basis/tools/deploy/test/test.factor
+++ b/basis/tools/deploy/test/test.factor
@@ -5,7 +5,7 @@ tools.deploy.backend tools.deploy.config.editor ;
 IN: tools.deploy.test
 
 : test-image ( -- str )
-    my-arch "test." ".image" surround ;
+    my-arch-name "test." ".image" surround ;
 
 : shake-and-bake ( vocab -- )
     [ test-image temp-file delete-file ] ignore-errors

diff --git a/extra/benchmark/hashtables/hashtables.factor b/extra/benchmark/hashtables/hashtables.factor
index 545d107977a737e0bac740af630b360088718857..f310c15be22a74de17b2165f6ccaf2cd0fb2cedc 100644 (file)
--- a/extra/benchmark/hashtables/hashtables.factor
+++ b/extra/benchmark/hashtables/hashtables.factor
@@ -3,6 +3,7 @@
 USING: accessors assocs combinators kernel locals math
 math.ranges memoize sequences strings hashtables
 math.parser grouping ;
+QUALIFIED: assocs
 IN: benchmark.hashtables
 
 MEMO: strings ( -- str )
@@ -32,7 +33,7 @@ MEMO: strings ( -- str )
     ] map drop
 
     keys [
-        hash [ 1 + ] change-at
+        hash [ 1 + ] assocs:change-at
     ] each ;
 
 : string-mix ( hash -- )

diff --git a/extra/compiler/cfg/gvn/avail/avail.factor b/extra/compiler/cfg/gvn/avail/avail.factor
index 4c39caf2b822706ef9b90cd4b882788ffe6ac9e0..2a4b0c2fc72fdb1039d7d2e43ee8d3374eb80ca8 100644 (file)
--- a/extra/compiler/cfg/gvn/avail/avail.factor
+++ b/extra/compiler/cfg/gvn/avail/avail.factor
@@ -10,6 +10,7 @@ compiler.cfg.predecessors
 compiler.cfg.renaming.functor
 compiler.cfg.rpo ;
 FROM: namespaces => set ;
+QUALIFIED: assocs
 IN: compiler.cfg.gvn.avail
 
 : defined ( bb -- vregs )
@@ -39,6 +40,6 @@ M: avail-analysis transfer-set drop defined assoc-union ;
     keep swap [ available-uses? ] [ drop f ] if ; inline
 
 : make-available ( vreg -- )
-    basic-block get avail-ins get [ dupd clone ?set-at ] change-at ;
+    basic-block get avail-ins get [ dupd clone ?set-at ] assocs:change-at ;
 
 RENAMING: >avail [ ] [ dup >avail-vreg swap or ] [ ]

diff --git a/extra/compiler/graphviz/graphviz.factor b/extra/compiler/graphviz/graphviz.factor
index 82548593c792dd6c68ef5a8c4dcfa45044ab6862..093169bcbdc330b06cf7ec359c1c6105b211b35f 100644 (file)
--- a/extra/compiler/graphviz/graphviz.factor
+++ b/extra/compiler/graphviz/graphviz.factor
@@ -6,6 +6,7 @@ compiler.cfg.dominance.private compiler.cfg.rpo
 compiler.tree.builder compiler.tree.recursive graphviz.render io
 io.encodings.ascii io.files io.files.unique io.launcher kernel
 make math math.parser namespaces quotations sequences words ;
+QUALIFIED: assocs
 IN: compiler.graphviz
 
 : quotes ( str -- str' ) "\"" "\"" surround ;
@@ -106,7 +107,8 @@ SYMBOL: vertex-names
 : vertex-name ( call-graph-node -- string )
     label>> vertex-names get [
         word>> name>>
-        dup word-counts get [ 0 or 1 + dup ] change-at number>string " #" glue
+        dup word-counts get [ 0 or 1 + dup ] assocs:change-at
+        number>string " #" glue
     ] cache ;
 
 : vertex-attrs ( obj -- string )

diff --git a/extra/mason/platform/platform.factor b/extra/mason/platform/platform.factor
index e6b2e881c59ec28265f5b67e6273c4b2e92d7027..d5012f4683eb178d4b0b204c0631dea990691a3d 100644 (file)
--- a/extra/mason/platform/platform.factor
+++ b/extra/mason/platform/platform.factor
@@ -15,7 +15,7 @@ IN: mason.platform
     "make" ;
 
 : target-arch ( -- arch )
-    target-os get target-cpu get arch ;
+    target-os get target-cpu get arch-name ;
 
 : target-boot-image-name ( -- string )
     target-arch boot-image-name ;

diff --git a/extra/mason/release/tidy/tidy.factor b/extra/mason/release/tidy/tidy.factor
index ba9e6be76d444e267a352d2891cdc45d18341fdd..5a6f9c2b790305c3d3dbd9165a93fa4d8cc6ad24 100644 (file)
--- a/extra/mason/release/tidy/tidy.factor
+++ b/extra/mason/release/tidy/tidy.factor
@@ -7,7 +7,7 @@ IN: mason.release.tidy
 
 : useless-files ( -- seq )
     "build-support/cleanup" ascii file-lines
-    images [ boot-image-name ] map append
+    image-names [ boot-image-name ] map append
     target-os get macosx? [ "Factor.app" suffix ] unless ;
 
 : tidy ( -- )

diff --git a/extra/tools/image-analyzer/image-analyzer-tests.factor b/extra/tools/image-analyzer/image-analyzer-tests.factor
index bcff120ee2622b379663c66b722fab2210109f1f..e8e4223edb6b6169ec4d6ca8317083dff88bc30c 100644 (file)
--- a/extra/tools/image-analyzer/image-analyzer-tests.factor
+++ b/extra/tools/image-analyzer/image-analyzer-tests.factor
@@ -9,7 +9,7 @@ IN: tools.image-analyzer.tests
     dup image-path exists? [ drop ] [ make-image ] if ;
 
 : loadable-images ( -- images )
-    images cpu name>> '[ _ tail? ] filter ;
+    image-names cpu name>> '[ _ tail? ] filter ;
 
 { t } [
     loadable-images [ [ ?make-image ] each ] [

diff --git a/extra/update/backup/backup.factor b/extra/update/backup/backup.factor
index 76e65f4c65ac1475df2607d87a533f947324af16..3f7dc8f5f3b2896babd6ab22773a2dec8d6c57ca 100644 (file)
--- a/extra/update/backup/backup.factor
+++ b/extra/update/backup/backup.factor
@@ -4,7 +4,7 @@ IN: update.backup
 
 : backup-boot-image ( -- )
   my-boot-image-name
-  { "boot." my-arch "-" [ "datestamp" get ] ".image" } to-string
+  { "boot." my-arch-name "-" [ "datestamp" get ] ".image" } to-string
   move-file ;
 
 : backup-image ( -- )

diff --git a/extra/webapps/mason/version/source/source.factor b/extra/webapps/mason/version/source/source.factor
index 6e5559c3b1c62f488b953e203a932760f67d21e2..503be3c582f53cbfc6bd8f76259338b0f2cc3799 100644 (file)
--- a/extra/webapps/mason/version/source/source.factor
+++ b/extra/webapps/mason/version/source/source.factor
@@ -20,7 +20,7 @@ IN: webapps.mason.version.source
     ".gitignore" delete-file ;
 
 : download-images ( -- )
-    images [ boot-image-name download-image ] each ;
+    image-names [ boot-image-name download-image ] each ;
 
 : prepare-source ( git-id -- )
     "factor" [