From 46587f8457c5818990035cd40ca138e775bb3e36 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 12 Aug 2015 11:08:24 -0500 Subject: [PATCH] factor: arch -> arch-name. fix breakage caused by other patch. --- basis/bootstrap/image/image.factor | 14 +++++++------- basis/bootstrap/image/upload/upload.factor | 2 +- basis/compiler/tests/linkage-errors.factor | 2 +- basis/html/streams/streams-tests.factor | 2 +- basis/io/launcher/unix/unix-tests.factor | 2 +- basis/tools/deploy/backend/backend.factor | 4 ++-- basis/tools/deploy/test/test.factor | 2 +- extra/benchmark/hashtables/hashtables.factor | 3 ++- extra/compiler/cfg/gvn/avail/avail.factor | 3 ++- extra/compiler/graphviz/graphviz.factor | 4 +++- extra/mason/platform/platform.factor | 2 +- extra/mason/release/tidy/tidy.factor | 2 +- .../image-analyzer/image-analyzer-tests.factor | 2 +- extra/update/backup/backup.factor | 2 +- extra/webapps/mason/version/source/source.factor | 2 +- 15 files changed, 26 insertions(+), 22 deletions(-) diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor index 12e5e77075..dda459e595 100755 --- 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 4b26326624..61fc31024b 100644 --- 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 318b229425..85b4624df5 100644 --- 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 29cb81e8a5..6c03d16178 100644 --- 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 ; { "" } [ [ "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 83b175f013..da2fb3c5bb 100644 --- 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 8c21fafbb2..1523cd5f98 100644 --- 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 54200225af..05e16ca10f 100644 --- 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 545d107977..f310c15be2 100644 --- 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 4c39caf2b8..2a4b0c2fc7 100644 --- 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 82548593c7..093169bcbd 100644 --- 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 e6b2e881c5..d5012f4683 100644 --- 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 ba9e6be76d..5a6f9c2b79 100644 --- 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 bcff120ee2..e8e4223edb 100644 --- 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 76e65f4c65..3f7dc8f5f3 100644 --- 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 6e5559c3b1..503be3c582 100644 --- 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" [ -- 2.34.1