core/basis/extra: using STARTUP-HOOK: and SHUTDOWN-HOOK:

diff --git a/basis/channels/remote/remote.factor b/basis/channels/remote/remote.factor
index ef0b3b15f1b70d2ca1785dfba52ea579569c0874..2ba2da0a433d4c1961789ba9d3de6feaec294db1 100644 (file)
--- a/basis/channels/remote/remote.factor
+++ b/basis/channels/remote/remote.factor
@@ -66,7 +66,7 @@ M: remote-channel to
 M: remote-channel from
     [ id>> from-message boa ] keep send-message ;
 
-[
+STARTUP-HOOK: [
     H{ } clone \ remote-channels set-global
     start-channel-node
-] "channel-registry" add-startup-hook
+]

diff --git a/basis/cocoa/cocoa.factor b/basis/cocoa/cocoa.factor
index 708381f633d554d3befb378f9e362859fa4c849c..01ee91007f1c28bc1a6fcbb71afbc9c80d9fcbeb 100644 (file)
--- a/basis/cocoa/cocoa.factor
+++ b/basis/cocoa/cocoa.factor
@@ -38,7 +38,7 @@ SYMBOL: frameworks
 
 frameworks [ V{ } clone ] initialize
 
-[ frameworks get [ load-framework ] each ] "cocoa" add-startup-hook
+STARTUP-HOOK: [ frameworks get [ load-framework ] each ]
 
 SYNTAX: FRAMEWORK: scan-token [ load-framework ] [ frameworks get push ] bi ;
 

diff --git a/basis/command-line/command-line.factor b/basis/command-line/command-line.factor
index 0bf66894f0d5ee0c05b4d61ee724221684d1cd4c..48518fe9d89cf22aaa638070f20a60be615b5bbd 100644 (file)
--- a/basis/command-line/command-line.factor
+++ b/basis/command-line/command-line.factor
@@ -101,9 +101,9 @@ SYMBOL: main-vocab-hook
         main-vocab "run" set
     ] with-global ;
 
-[
+STARTUP-HOOK: [
     H{ } user-init-errors set-global
     default-cli-args
-] "command-line" add-startup-hook
+]
 
 { "debugger" "command-line" } "command-line.debugger" require-when

diff --git a/basis/concurrency/distributed/distributed.factor b/basis/concurrency/distributed/distributed.factor
index 8f3524697df518b1c88eeb22f3dfd66c418dc272..45afe537c142292e25e5f6771cf54cb0ce5df42f 100644 (file)
--- a/basis/concurrency/distributed/distributed.factor
+++ b/basis/concurrency/distributed/distributed.factor
@@ -77,7 +77,7 @@ M: thread (serialize)
 : stop-node ( -- )
     f local-node get insecure>> send-remote-message ;
 
-[
+STARTUP-HOOK: [
     H{ } clone \ registered-remote-threads set-global
     H{ } clone \ thread-connections set-global
-] "remote-thread-registry" add-startup-hook
+]

diff --git a/basis/core-foundation/fsevents/fsevents.factor b/basis/core-foundation/fsevents/fsevents.factor
index fb216f55c4d9916f3518048dcb6a69c23eef0bd6..c63ec926b2509e9806d7a6b4f07ffc54621c4db5 100644 (file)
--- a/basis/core-foundation/fsevents/fsevents.factor
+++ b/basis/core-foundation/fsevents/fsevents.factor
@@ -174,10 +174,10 @@ SYMBOL: event-stream-callbacks
 : event-stream-counter ( -- n )
     \ event-stream-counter counter ;
 
-[
+STARTUP-HOOK: [
     event-stream-callbacks
     [ [ drop expired? ] H{ } assoc-reject-as ] change-global
-] "core-foundation" add-startup-hook
+]
 
 : add-event-source-callback ( quot -- id )
     event-stream-counter <alien>

diff --git a/basis/core-foundation/run-loop/run-loop.factor b/basis/core-foundation/run-loop/run-loop.factor
index fbd1ab4b5b8c1677f4c79d71bc800838817b2d7e..666d1043c4fa0d955c44f697229db2b9e483d95a 100644 (file)
--- a/basis/core-foundation/run-loop/run-loop.factor
+++ b/basis/core-foundation/run-loop/run-loop.factor
@@ -102,8 +102,8 @@ SYMBOL: run-loop
     ] change-timers drop ;
 
 SYMBOL: thread-timer
-[ f thread-timer set-global ]
-"core-foundation.run-loop" add-startup-hook
+
+STARTUP-HOOK: [ f thread-timer set-global ]
 
 : (reset-thread-timer) ( timer -- )
     sleep-time

diff --git a/basis/core-text/core-text.factor b/basis/core-text/core-text.factor
index 9b98890c801e060965b215848a0353436e1758df..fc5b9c7d6f4ff61a0368766311bf66940a1e2155 100644 (file)
--- a/basis/core-text/core-text.factor
+++ b/basis/core-text/core-text.factor
@@ -172,4 +172,4 @@ SYMBOL: cached-lines
 : cached-line ( font string -- line )
     cached-lines get-global [ <line> ] 2cache ;
 
-[ <cache-assoc> cached-lines set-global ] "core-text" add-startup-hook
+STARTUP-HOOK: [ <cache-assoc> cached-lines set-global ]

diff --git a/basis/core-text/fonts/fonts.factor b/basis/core-text/fonts/fonts.factor
index a91a52bf04a65017a390a086a464868dea975067..3900fc382352b8a65a372aa2b45ed80cd21092f2 100644 (file)
--- a/basis/core-text/fonts/fonts.factor
+++ b/basis/core-text/fonts/fonts.factor
@@ -118,7 +118,7 @@ MEMO: (cache-font-metrics) ( name size traits -- metrics )
 : cache-font-metrics ( font -- metrics )
     [ name>> ] [ size>> ] [ font-traits ] tri (cache-font-metrics) ;
 
-[
+STARTUP-HOOK: [
     \ (cache-font) reset-memoized
     \ (cache-font-metrics) reset-memoized
-] "core-text.fonts" add-startup-hook
+]

diff --git a/basis/cpu/x86/features/features.factor b/basis/cpu/x86/features/features.factor
index 3091620e9335bd61ab8610bfe62307fcd183474e..358b87145a8d4a5157e229cf3a76e57c1a575601 100644 (file)
--- a/basis/cpu/x86/features/features.factor
+++ b/basis/cpu/x86/features/features.factor
@@ -164,8 +164,9 @@ HOOK: (cpuid) cpu ( rax rcx regs -- )
 MEMO: enable-popcnt? ( -- ? )
     popcnt? "disable-popcnt" get not and ;
 
-[ { sse-version enable-popcnt? } [ reset-memoized ] each ]
-"cpu.x86.features" add-startup-hook
+STARTUP-HOOK: [
+    { sse-version enable-popcnt? } [ reset-memoized ] each
+]
 
 : sse-string ( version -- string )
     {

diff --git a/basis/environment/environment.factor b/basis/environment/environment.factor
index f945d2933c516da43a40767382547e84c5647ed8..4647fb45787346539beca577197865680321fd4f 100644 (file)
--- a/basis/environment/environment.factor
+++ b/basis/environment/environment.factor
@@ -34,10 +34,9 @@ HOOK: set-os-envs-pointer os ( malloc -- )
     { [ os windows? ] [ "environment.windows" require ] }
 } cond
 
-[
-    "FACTOR_ROOTS" os-env
-    [
+STARTUP-HOOK: [
+    "FACTOR_ROOTS" os-env [
         os windows? ";" ":" ? split
         [ add-vocab-root ] each
     ] when*
-] "environment" add-startup-hook
+]

diff --git a/basis/game/input/input.factor b/basis/game/input/input.factor
index 204de8b9d755159c9b5934f046170e472b278750..3f92333cc5c719cf5c81392bc08a7e81af0f5a20 100644 (file)
--- a/basis/game/input/input.factor
+++ b/basis/game/input/input.factor
@@ -36,10 +36,10 @@ M: f (reset-game-input) ;
 : reset-game-input ( -- )
     (reset-game-input) ;
 
-[ reset-game-input ] "game-input" add-startup-hook
-
 PRIVATE>
 
+STARTUP-HOOK: reset-game-input
+
 ERROR: game-input-not-open ;
 
 : open-game-input ( -- )
@@ -48,6 +48,7 @@ ERROR: game-input-not-open ;
     ] unless
     game-input-opened [ 1 + ] change-global
     reset-mouse ;
+
 : close-game-input ( -- )
     game-input-opened [
         dup zero? [ game-input-not-open ] when

diff --git a/basis/io/backend/unix/freebsd/freebsd.factor b/basis/io/backend/unix/freebsd/freebsd.factor
index 9c094679dc72f948f680c644db957f3401b8c31b..38a66e0467431d59647b75b0eb7116c3864f511b 100644 (file)
--- a/basis/io/backend/unix/freebsd/freebsd.factor
+++ b/basis/io/backend/unix/freebsd/freebsd.factor
@@ -7,5 +7,4 @@ M: freebsd init-io
 
 freebsd set-io-backend
 
-[ start-signal-pipe-thread ] 
-"io.backend.unix:signal-pipe-thread" add-startup-hook
+STARTUP-HOOK: start-signal-pipe-thread

diff --git a/basis/io/backend/unix/linux/linux.factor b/basis/io/backend/unix/linux/linux.factor
index f3e123cd842c3bd0c34b50726de9aaeedcfae60d..b52dba1a799c286d93872a1d0bd6289f3f146039 100644 (file)
--- a/basis/io/backend/unix/linux/linux.factor
+++ b/basis/io/backend/unix/linux/linux.factor
@@ -10,4 +10,4 @@ M: linux init-io
 
 linux set-io-backend
 
-[ start-signal-pipe-thread ] "io.backend.unix:signal-pipe-thread" add-startup-hook
+STARTUP-HOOK: start-signal-pipe-thread

diff --git a/basis/io/backend/unix/macosx/macosx.factor b/basis/io/backend/unix/macosx/macosx.factor
index 403b97b0ac806dcc91dee8d9b333cc3917fe31be..a87656238aacba4c20f13ac15e65fe608d62b33f 100644 (file)
--- a/basis/io/backend/unix/macosx/macosx.factor
+++ b/basis/io/backend/unix/macosx/macosx.factor
@@ -16,5 +16,4 @@ M: macosx init-io
 
 macosx set-io-backend
 
-[ start-signal-pipe-thread ]
-"io.backend.unix:signal-pipe-thread" add-startup-hook
+STARTUP-HOOK: start-signal-pipe-thread

diff --git a/basis/io/files/temp/temp.factor b/basis/io/files/temp/temp.factor
index b1c18725c1bb78cd218da72efa25557dc8844c97..f6eb7b9f96501cab6edf237bc28e358cdbf03bd1 100644 (file)
--- a/basis/io/files/temp/temp.factor
+++ b/basis/io/files/temp/temp.factor
@@ -36,10 +36,10 @@ SYMBOL: current-cache-directory
     { [ os unix? ] [ "io.files.temp.unix" ] }
 } cond require
 
-[
+STARTUP-HOOK: [
     default-temp-directory dup make-directories
     current-temp-directory set-global
 
     default-cache-directory dup make-directories
     current-cache-directory set-global
-] "io.files.temp" add-startup-hook
+]

diff --git a/basis/io/launcher/launcher.factor b/basis/io/launcher/launcher.factor
index f82929fd153792b691496f7a48731e15938d5f6c..7e5aac1e458b914804f73dddb54682fddc29acd5 100644 (file)
--- a/basis/io/launcher/launcher.factor
+++ b/basis/io/launcher/launcher.factor
@@ -93,10 +93,10 @@ SYMBOL: wait-delay
     5 wait-delay set-global
     [ wait-loop t ] "Process wait" spawn-server drop ;
 
-[
+STARTUP-HOOK: [
     H{ } clone processes set-global
     start-wait-thread
-] "io.launcher" add-startup-hook
+]
 
 : process-started ( process handle -- )
     >>handle

diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor
index 65e915b7f67be42a32761d86d0c36c0a59373209..8c40b0d980c1914d855c04869d5d46bb77044553 100644 (file)
--- a/basis/io/sockets/sockets.factor
+++ b/basis/io/sockets/sockets.factor
@@ -382,8 +382,7 @@ CONSTANT: datagram-size 65536
 MEMO: ipv6-supported? ( -- ? )
     [ "::1" 0 <inet6> binary <server> dispose t ] [ drop f ] recover ;
 
-[ \ ipv6-supported? reset-memoized ]
-"io.sockets:ipv6-supported?" add-startup-hook
+STARTUP-HOOK: [ \ ipv6-supported? reset-memoized ]
 
 GENERIC: resolve-host ( addrspec -- seq )
 

diff --git a/basis/io/thread/thread.factor b/basis/io/thread/thread.factor
index 8c069f440c2e6ab016ee414c0cbf731105f86d53..50a71ea04d9bc1187af8e11382bba5836f1f9651 100644 (file)
--- a/basis/io/thread/thread.factor
+++ b/basis/io/thread/thread.factor
@@ -27,4 +27,4 @@ M: io-thread error-in-thread die drop rethrow ;
 : stop-io-thread ( -- )
     f io-thread-running? set-global ;
 
-[ start-io-thread ] "io.thread" add-startup-hook
+STARTUP-HOOK: start-io-thread

diff --git a/basis/logging/server/server.factor b/basis/logging/server/server.factor
index 7326ea4b7ca4f301ddb5a0c65064bb9991a999ea..a66697f1ea4c014113ef4cf9e1e659b90c06d120 100644 (file)
--- a/basis/logging/server/server.factor
+++ b/basis/logging/server/server.factor
@@ -105,7 +105,7 @@ CONSTANT: keep-logs 10
     "Log server" spawn-server
     "log-server" set-global ;
 
-[
+STARTUP-HOOK: [
     H{ } clone log-files set-global
     log-server
-] "logging" add-startup-hook
+]

diff --git a/basis/opengl/gl/extensions/extensions.factor b/basis/opengl/gl/extensions/extensions.factor
index 4fbf78bac2029551af35fc5627f50a1d6e69e3fc..a3728d5175f3996a4115ff8d4302dd5ab5d7a655 100644 (file)
--- a/basis/opengl/gl/extensions/extensions.factor
+++ b/basis/opengl/gl/extensions/extensions.factor
@@ -19,7 +19,8 @@ SYMBOL: +gl-function-pointers+
 : reset-gl-function-pointers ( -- )
     100 <hashtable> +gl-function-pointers+ set-global ;
 
-[ reset-gl-function-pointers ] "opengl.gl" add-startup-hook
+STARTUP-HOOK: reset-gl-function-pointers
+
 reset-gl-function-pointers
 reset-gl-function-number-counter
 

diff --git a/basis/opengl/opengl.factor b/basis/opengl/opengl.factor
index ff2b36c50af1986e651742e1e7ea85652b110c03..bb63cab67834b5792ed66d68cbe42a7a0b2082d2 100644 (file)
--- a/basis/opengl/opengl.factor
+++ b/basis/opengl/opengl.factor
@@ -253,4 +253,4 @@ MACRO: set-draw-buffers ( buffers -- quot )
     GL_MODELVIEW glMatrixMode
     glLoadIdentity ;
 
-[ f gl-scale-factor set-global ] "opengl" add-startup-hook
+STARTUP-HOOK: [ f gl-scale-factor set-global ]

diff --git a/basis/openssl/openssl.factor b/basis/openssl/openssl.factor
index de15c2c97a7668160883ac00b2b6d8347f06af39..977f8d0f3004cc526477d73e229279a2509e16a4 100644 (file)
--- a/basis/openssl/openssl.factor
+++ b/basis/openssl/openssl.factor
@@ -45,4 +45,4 @@ SINGLETON: openssl
         t ssl-initialized? set-global
     ] unless ;
 
-[ f ssl-initialized? set-global ] "openssl" add-startup-hook
+STARTUP-HOOK: [ f ssl-initialized? set-global ]

diff --git a/basis/random/mersenne-twister/mersenne-twister.factor b/basis/random/mersenne-twister/mersenne-twister.factor
index e93a26401388633ff8acd0907a03f3d9bcc2b362..1e3351414363e33f83409bc3f800d5f98c9d281d 100644 (file)
--- a/basis/random/mersenne-twister/mersenne-twister.factor
+++ b/basis/random/mersenne-twister/mersenne-twister.factor
@@ -74,6 +74,6 @@ M: mersenne-twister random-32*
 : default-mersenne-twister ( -- mersenne-twister )
     nano-count <mersenne-twister> ;
 
-[
+STARTUP-HOOK: [
     default-mersenne-twister random-generator set-global
-] "bootstrap.random" add-startup-hook
+]

diff --git a/basis/random/unix/unix.factor b/basis/random/unix/unix.factor
index 060d1afe502c064b17e4803160ddd7aca985f725..ab723bb7e063c4a20248c4f8c062371342774d90 100644 (file)
--- a/basis/random/unix/unix.factor
+++ b/basis/random/unix/unix.factor
@@ -17,7 +17,10 @@ M: unix-random random-bytes*
 
 HINTS: M\ unix-random random-bytes* { fixnum unix-random } ;
 
-[
-    "/dev/random" <unix-random> &dispose secure-random-generator set-global
-    "/dev/urandom" <unix-random> &dispose system-random-generator set-global
-] "random.unix" add-startup-hook
+STARTUP-HOOK: [
+    "/dev/random" <unix-random> &dispose
+    secure-random-generator set-global
+
+    "/dev/urandom" <unix-random> &dispose
+    system-random-generator set-global
+]

diff --git a/basis/random/windows/windows.factor b/basis/random/windows/windows.factor
index a4611bf1bf31548c37b57f320c49364537499ac0..9f9aded4fb2c98e5b4624022deba3530d2fb7998 100644 (file)
--- a/basis/random/windows/windows.factor
+++ b/basis/random/windows/windows.factor
@@ -56,7 +56,7 @@ M: windows-crypto-context random-bytes*
         [ first2 <windows-crypto-context> ] attempt-all
     ] [ 2drop f ] recover ;
 
-[
+STARTUP-HOOK: [
     {
         ${ MS_ENHANCED_PROV PROV_RSA_FULL }
         ${ MS_DEF_PROV PROV_RSA_FULL }
@@ -66,4 +66,4 @@ M: windows-crypto-context random-bytes*
         ${ MS_STRONG_PROV PROV_RSA_FULL }
         ${ MS_ENH_RSA_AES_PROV PROV_RSA_AES }
     } try-crypto-providers secure-random-generator set-global
-] "random.windows" add-startup-hook
+]

diff --git a/basis/threads/threads.factor b/basis/threads/threads.factor
index c48a69ed87fab8a5444c2de9eda8760c1eba7dca..c4ce4387fad4914eb3968038a204484f8c677a80 100644 (file)
--- a/basis/threads/threads.factor
+++ b/basis/threads/threads.factor
@@ -262,4 +262,4 @@ M: real sleep
 
 PRIVATE>
 
-[ init-threads ] "threads" add-startup-hook
+STARTUP-HOOK: init-threads

diff --git a/basis/tools/crossref/crossref.factor b/basis/tools/crossref/crossref.factor
index 3183f4ddae1622240030d84d203a5e8fc5900329..66b48c2566e7c209d034ccb2a4f4c6bbd977e287 100644 (file)
--- a/basis/tools/crossref/crossref.factor
+++ b/basis/tools/crossref/crossref.factor
@@ -146,6 +146,6 @@ M: invalidate-crossref definitions-changed
     drop [ null? not ] [ not ] bi or
     [ f crossref set-global ] when ;
 
-[ invalidate-crossref add-definition-observer ] "tools.crossref" add-startup-hook
+STARTUP-HOOK: [ invalidate-crossref add-definition-observer ]
 
 PRIVATE>

diff --git a/basis/tools/deprecation/deprecation.factor b/basis/tools/deprecation/deprecation.factor
index c73d345a08dccfa2e72910b7ad47483b84ff0c01..9d284809172b28b243d50ca8e126cf5aa94a9f72 100644 (file)
--- a/basis/tools/deprecation/deprecation.factor
+++ b/basis/tools/deprecation/deprecation.factor
@@ -75,7 +75,6 @@ M: deprecation-observer definitions-changed
     [ [ check-deprecations ] each ]
     [ drop initialize-deprecation-notes ] if ;
 
-[ deprecation-observer add-definition-observer ]
-"tools.deprecation" add-startup-hook
+STARTUP-HOOK: [ deprecation-observer add-definition-observer ]
 
 initialize-deprecation-notes

diff --git a/basis/ui/text/pango/pango.factor b/basis/ui/text/pango/pango.factor
index 38f285e80df4a091b964c94ee99eee4eead1c48f..0714298d30fa07f8b94d23345918e67d53c60e34 100644 (file)
--- a/basis/ui/text/pango/pango.factor
+++ b/basis/ui/text/pango/pango.factor
@@ -204,9 +204,9 @@ M: pango-renderer line-metrics
     [ cached-layout metrics>> ]
     if-empty ;
 
-[
+STARTUP-HOOK: [
     \ (cache-font-description) reset-memoized
     <cache-assoc> cached-layouts set-global
-] "ui.text.pango" add-startup-hook
+]
 
 pango-renderer font-renderer set-global

diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor
index 0ac48742e558d3a22a8aedaf7cc7c4c1b0fd5e1f..05a1ead5249d6751c133e711525418b2d16f279a 100644 (file)
--- a/basis/ui/tools/error-list/error-list.factor
+++ b/basis/ui/tools/error-list/error-list.factor
@@ -204,7 +204,7 @@ M: error-list-updater errors-changed
 
 \ show-error-list H{ { +nullary+ t } } define-command
 
-[
+STARTUP-HOOK: [
     f <model> 100 milliseconds <delay> error-list-model set-global
     error-list-updater add-error-observer
-] "ui.tools.error-list" add-startup-hook
+]

diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 378e46907eb0c278fbb1b754e865620f111c8a91..93abb0ba96af51786949ce8c49f29a9a11f38e1a 100644 (file)
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -208,10 +208,10 @@ HOOK: close-window ui-backend ( gadget -- )
 M: object close-window
     find-world [ ungraft ] when* ;
 
-[
+STARTUP-HOOK: [
     f ui-running set-global
     <flag> ui-notify-flag set-global
-] "ui" add-startup-hook
+]
 
 HOOK: resize-window ui-backend ( world dim -- )
 M: object resize-window 2drop ;

diff --git a/basis/vocabs/cache/cache.factor b/basis/vocabs/cache/cache.factor
index 7a09dc4a8a2e8bd138616ee356947a7266a28576..6a369d961c65b0ac3d05301db0a055b8c6e6882c 100644 (file)
--- a/basis/vocabs/cache/cache.factor
+++ b/basis/vocabs/cache/cache.factor
@@ -34,7 +34,7 @@ M: cache-observer vocab-changed
     drop dup forgot-vocab? [ reset-vocab-cache ] [ drop ] if
     reset-disk-cache ;
 
-[
+STARTUP-HOOK: [
     f changed-vocabs set-global
     cache-observer add-vocab-observer
-] "vocabs.cache" add-startup-hook
+]

diff --git a/basis/vocabs/refresh/monitor/monitor.factor b/basis/vocabs/refresh/monitor/monitor.factor
index 3186c2e352e743c18585f25cf9ef99399a08e4e7..6e72df2b158d7c55a1d4eacd3ec5080743572c56 100644 (file)
--- a/basis/vocabs/refresh/monitor/monitor.factor
+++ b/basis/vocabs/refresh/monitor/monitor.factor
@@ -65,7 +65,7 @@ TR: convert-separators "/\\" ".." ;
     HS{ } clone changed-vocabs set-global
     loaded-vocab-names [ changed-vocab ] each ;
 
-[
+STARTUP-HOOK: [
     "-no-monitors" (command-line) member? [
         [ drop ] add-vocab-root-hook set-global
         f changed-vocabs set-global
@@ -74,4 +74,4 @@ TR: convert-separators "/\\" ".." ;
         vocab-roots get [ start-vocab-monitor ] each
         [ start-vocab-monitor ] add-vocab-root-hook set-global
     ] if
-] "vocabs.refresh.monitor" add-startup-hook
+]

diff --git a/basis/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor
index 93cfe8f5f2932b6d23089a7b4cac667679a8224c..2f333b1004a6d875d849c899730d99ba0ef997aa 100644 (file)
--- a/basis/windows/com/wrapper/wrapper.factor
+++ b/basis/windows/com/wrapper/wrapper.factor
@@ -140,7 +140,7 @@ unless
     +live-wrappers+ get-global [ (allocate-wrapper) ] each
     H{ } +wrapped-objects+ set-global ;
 
-[ com-startup-hook ] "windows.com.wrapper" add-startup-hook
+STARTUP-HOOK: com-startup-hook
 
 PRIVATE>
 

diff --git a/basis/windows/directx/dinput/constants/constants.factor b/basis/windows/directx/dinput/constants/constants.factor
index f7ab901417d80bf20d438ee6afd6980a8b9ec6a8..5d95d6ae937cf4c5617d8c4d7908fde7e6b6bfd2 100644 (file)
--- a/basis/windows/directx/dinput/constants/constants.factor
+++ b/basis/windows/directx/dinput/constants/constants.factor
@@ -832,7 +832,7 @@ MACRO: <DIDATAFORMAT> ( dwFlags dwDataSize struct rgodf-array -- alien )
     define-guid-constants
     define-format-constants ;
 
-[ define-constants ] "windows.directx.dinput.constants" add-startup-hook
+STARTUP-HOOK: define-constants
 
 : uninitialize ( variable quot -- )
     '[ _ when* f ] change-global ; inline

diff --git a/basis/windows/dropfiles/dropfiles.factor b/basis/windows/dropfiles/dropfiles.factor
index 1c0e1dde484448f8a8ac5509c6d0df26fcb3850e..0074f44716174b8899e6b0622759aaed030bf2ea 100644 (file)
--- a/basis/windows/dropfiles/dropfiles.factor
+++ b/basis/windows/dropfiles/dropfiles.factor
@@ -62,6 +62,4 @@ IN: windows.dropfiles
 : reject-files ( -- )
     world get world-reject-files ;
 
-[
-    f \ init-message-filter set-global
-] "init-dropfiles" add-startup-hook
+STARTUP-HOOK: [ f \ init-message-filter set-global ]

diff --git a/basis/windows/fonts/fonts.factor b/basis/windows/fonts/fonts.factor
index 8e61d2989a27aa62969db93a290327c9d6c9bfd6..8b09cd214d976bb754d4e8ba451fb948699e970b 100644 (file)
--- a/basis/windows/fonts/fonts.factor
+++ b/basis/windows/fonts/fonts.factor
@@ -39,10 +39,10 @@ MEMO:: (cache-font) ( name size bold? italic? -- HFONT )
     { [ name>> ] [ size>> ] [ bold?>> ] [ italic?>> ] } cleave
     (cache-font) ;
 
-[
+STARTUP-HOOK: [
     \ (cache-font) reset-memoized
     \ windows-fonts reset-memoized
-] "windows.fonts" add-startup-hook
+]
 
 : TEXTMETRIC>metrics ( TEXTMETRIC -- metrics )
     [ metrics new 0 >>width ] dip {

diff --git a/basis/windows/gdiplus/gdiplus.factor b/basis/windows/gdiplus/gdiplus.factor
index c7843d4f8e055d20c7e888ac2ddfec85ac0594a2..607daa704da12be6015ccfb6b04aed3a75d6aa38 100644 (file)
--- a/basis/windows/gdiplus/gdiplus.factor
+++ b/basis/windows/gdiplus/gdiplus.factor
@@ -1651,5 +1651,6 @@ DESTRUCTOR: stop-gdi+
 
 SYMBOL: gdi-token
 
-[ start-gdi+ gdi-token set-global ] "windows.gdiplus" add-startup-hook
-[ gdi-token get-global [ stop-gdi+ ] when* ] "windows.gdiplus" add-shutdown-hook
+STARTUP-HOOK: [ start-gdi+ gdi-token set-global ]
+
+SHUTDOWN-HOOK: [ gdi-token get-global [ stop-gdi+ ] when* ]

diff --git a/basis/windows/uniscribe/uniscribe.factor b/basis/windows/uniscribe/uniscribe.factor
index 326d17a9c0ac74ed6bb906d976d8035eab65e344..299ef2f481a3e896436031863936a695e4ca078f 100644 (file)
--- a/basis/windows/uniscribe/uniscribe.factor
+++ b/basis/windows/uniscribe/uniscribe.factor
@@ -171,5 +171,4 @@ SYMBOL: cached-script-strings
         ] with-memory-dc
     ] unless image>> ;
 
-[ <cache-assoc> cached-script-strings set-global ]
-"windows.uniscribe" add-startup-hook
+STARTUP-HOOK: [ <cache-assoc> cached-script-strings set-global ]

diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor
index 7ac216e8ce9b8b8e202a2afd5a39f0c973dc5588..e548959c4f0b03340d65df7efacc681c08e97fa8 100644 (file)
--- a/basis/windows/winsock/winsock.factor
+++ b/basis/windows/winsock/winsock.factor
@@ -526,5 +526,5 @@ ERROR: winsock-exception n string ;
 
 : shutdown-winsock ( -- ) WSACleanup winsock-return-check ;
 
-[ init-winsock ] "windows.winsock" add-startup-hook
-[ shutdown-winsock ] "windows.winsock" add-shutdown-hook
+STARTUP-HOOK: init-winsock
+SHUTDOWN-HOOK: shutdown-winsock

diff --git a/core/alien/alien.factor b/core/alien/alien.factor
index cb73df0c0420ac797af05a0e8fae478bf887ec7b..385fd606aeca713ee4db6bb035beb0a6f5c5be3e 100644 (file)
--- a/core/alien/alien.factor
+++ b/core/alien/alien.factor
@@ -105,7 +105,7 @@ ERROR: callsite-not-compiled word ;
 ! cleared on startup.
 SYMBOL: callbacks
 
-[ H{ } clone callbacks set-global ] "alien" add-startup-hook
+STARTUP-HOOK: [ H{ } clone callbacks set-global ]
 
 ! Used by compiler.codegen to wrap callback bodies
 : do-callback ( callback-quot wait-quot: ( callback -- ) -- )

diff --git a/core/alien/strings/strings.factor b/core/alien/strings/strings.factor
index 60b7eaa6ce60e8710a795a4c5d8f0f29aa7fe56b..4202e10f5b4d394330f888960641bafb2205e135 100644 (file)
--- a/core/alien/strings/strings.factor
+++ b/core/alien/strings/strings.factor
@@ -90,11 +90,11 @@ M: array symbol>string [ utf8 alien>string ] map ", " join ;
 : special-object>string ( n -- str )
     special-object utf8 alien>string ;
 
-[
+STARTUP-HOOK: [
     OBJ-CPU special-object>string string>cpu \ cpu set-global
     OBJ-OS special-object>string string>os \ os set-global
     OBJ-VM-VERSION special-object>string \ vm-version set-global
     OBJ-VM-GIT-LABEL special-object>string \ vm-git-label set-global
     OBJ-VM-COMPILER special-object>string \ vm-compiler set-global
     OBJ-VM-COMPILE-TIME special-object>string \ vm-compile-time set-global
-] "alien.strings" add-startup-hook
+]

diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor
index 3a50096a0bbbdf6431443cbacf80dc867ac1e9ec..07e2e23c21a39592e972e4f1cf35c1cb105fd20d 100644 (file)
--- a/core/compiler/units/units.factor
+++ b/core/compiler/units/units.factor
@@ -91,12 +91,12 @@ SYMBOL: definition-observers
 
 GENERIC: definitions-changed ( set obj -- )
 
-[ V{ } clone definition-observers set-global ]
-"compiler.units" add-startup-hook
+STARTUP-HOOK: [
+    V{ } clone definition-observers set-global
 
-! This goes here because vocabs cannot depend on init
-[ V{ } clone vocab-observers set-global ]
-"vocabs" add-startup-hook
+    ! This goes here because vocabs cannot depend on init
+    V{ } clone vocab-observers set-global
+]
 
 : add-definition-observer ( obj -- )
     definition-observers get push ;

diff --git a/core/destructors/destructors.factor b/core/destructors/destructors.factor
index c50435fed10a9f7ba965559b9758aa8643385b4e..acd6ef922d9d67a94fc941eff1a117b894008f77 100644 (file)
--- a/core/destructors/destructors.factor
+++ b/core/destructors/destructors.factor
@@ -90,13 +90,13 @@ PRIVATE>
         cleanup
     ] with-variables ; inline
 
-[
+STARTUP-HOOK: [
     HS{ } clone disposables set-global
     V{ } clone always-destructors set-global
     V{ } clone error-destructors set-global
-] "destructors" add-startup-hook
+]
 
-[
+SHUTDOWN-HOOK: [
     do-always-destructors
     do-error-destructors
-] "destructors" add-shutdown-hook
+]

diff --git a/core/io/backend/backend.factor b/core/io/backend/backend.factor
index 07d866b56ac1079d26864cb6890700104ac0ad87..b910e273ddc2ae104b20280cd268aba1422940a6 100644 (file)
--- a/core/io/backend/backend.factor
+++ b/core/io/backend/backend.factor
@@ -27,5 +27,4 @@ HOOK: normalize-path io-backend ( path -- path' )
     io-backend set-global init-io init-stdio
     "io.files" startup-hooks get at call( -- ) ;
 
-[ init-io embedded? [ init-stdio ] unless ]
-"io.backend" add-startup-hook
+STARTUP-HOOK: [ init-io embedded? [ init-stdio ] unless ]

diff --git a/core/io/files/files.factor b/core/io/files/files.factor
index 3190bc68841640932b6e90dd29db6091fa3fdbe7..da74c316c762b4f0e824d144e8042e0c21d8e954 100644 (file)
--- a/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@ -90,9 +90,9 @@ PRIVATE>
     ] map-find drop
     [ image-path parent-directory ] unless* "resource-path" set-global ;
 
-[
+STARTUP-HOOK: [
     cwd current-directory set-global
     OBJ-IMAGE special-object alien>native-string \ image-path set-global
     OBJ-EXECUTABLE special-object alien>native-string \ vm-path set-global
     init-resource-path
-] "io.files" add-startup-hook
+]

diff --git a/core/source-files/errors/errors.factor b/core/source-files/errors/errors.factor
index fd790dcb4c6166d6b6646cf43ef2c609dd72f6a3..4dbf64dd70e430b0b4712acaa14cff928278e83e 100644 (file)
--- a/core/source-files/errors/errors.factor
+++ b/core/source-files/errors/errors.factor
@@ -68,9 +68,7 @@ GENERIC: errors-changed ( observer -- )
 
 SYMBOL: error-observers
 
-[
-    V{ } clone error-observers set-global
-] "source-files.errors" add-startup-hook
+STARTUP-HOOK: [ V{ } clone error-observers set-global ]
 
 : add-error-observer ( observer -- )
     error-observers get push ;

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 5c24341c45a2c0b35f890b6d8908e89a9548910e..5814657aee82d36edf24ed973a5ab1ee7fbc4c0b 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -16,11 +16,10 @@ CONSTANT: default-vocab-roots {
     "resource:work"
 }
 
-[
+STARTUP-HOOK: [
     default-vocab-roots V{ } like vocab-roots set-global
-
     [ drop ] add-vocab-root-hook set-global
-] "vocabs.loader" add-startup-hook
+]
 
 : add-vocab-root ( root -- )
     trim-tail-separators dup vocab-roots get ?adjoin

diff --git a/extra/audio/gadget/gadget.factor b/extra/audio/gadget/gadget.factor
index 7ef80c93406cab66c8266042c0efd2cdb025724a..dbf194ba323a6038e53dcbba2d1489db622b0f69 100644 (file)
--- a/extra/audio/gadget/gadget.factor
+++ b/extra/audio/gadget/gadget.factor
@@ -16,11 +16,11 @@ CONSTANT: pause-label-image-path "vocab:audio/gadget/pause.png"
 
 SYMBOLS: play-label-image pause-label-image gadget-audio-engine ;
 
-[
+STARTUP-HOOK: [
     f play-label-image set-global
     f pause-label-image set-global
     f gadget-audio-engine set-global
-] "audio.gadget" add-startup-hook
+]
 
 : initialize-audio-gadgets ( -- )
     gadget-audio-engine get-global [

diff --git a/extra/mason/updates/updates.factor b/extra/mason/updates/updates.factor
index d92d307e944a449660790bdb06c07ba78df707c3..f75cdf74b6739971047676f4d0ded3c45b81171d 100644 (file)
--- a/extra/mason/updates/updates.factor
+++ b/extra/mason/updates/updates.factor
@@ -10,10 +10,10 @@ C: <sources> sources
 
 SYMBOLS: latest-sources last-built-sources ;
 
-[
+STARTUP-HOOK: [
     f latest-sources set-global
     f last-built-sources set-global
-] "mason.updates" add-startup-hook
+]
 
 : latest-boot-image ( -- boot-image )
     target-boot-image-name

diff --git a/extra/python/python.factor b/extra/python/python.factor
index 0a20ed6d4e3e5ba51ce582f4da1163d225b8f286..fa6f41db96f808e9b1fb4bb0d6805912ab0ecce2 100644 (file)
--- a/extra/python/python.factor
+++ b/extra/python/python.factor
@@ -115,5 +115,5 @@ ERROR: missing-type type ;
 : python-dll-loaded? ( -- ? )
     "Py_IsInitialized" "python" dlsym? ;
 
-[ python-dll-loaded? [ py-initialize ] when ] "python" add-startup-hook
-[ python-dll-loaded? [ py-finalize ] when ] "python" add-shutdown-hook
+STARTUP-HOOK: [ python-dll-loaded? [ py-initialize ] when ]
+SHUTDOWN-HOOK: [ python-dll-loaded? [ py-finalize ] when ]

diff --git a/extra/site-watcher/site-watcher.factor b/extra/site-watcher/site-watcher.factor
index 16deccc8ee2ae88fa3623eca91024dbd5a85120b..b287ad653f892cd1656625c1230b0ff0e56b2c17 100644 (file)
--- a/extra/site-watcher/site-watcher.factor
+++ b/extra/site-watcher/site-watcher.factor
@@ -9,7 +9,7 @@ SYMBOL: site-watcher-frequency
 5 minutes site-watcher-frequency set-global
 
 SYMBOL: running-site-watcher
-[ f running-site-watcher set-global ] "site-watcher" add-startup-hook
+STARTUP-HOOK: [ f running-site-watcher set-global ]
 
 <PRIVATE
 

diff --git a/extra/sodium/sodium.factor b/extra/sodium/sodium.factor
index 307081dbf7ad2ade72a30ab17ee6fc53427e6dd6..7fb46df4985c41a32f08e7755c0cab03b4845ddb 100644 (file)
--- a/extra/sodium/sodium.factor
+++ b/extra/sodium/sodium.factor
@@ -125,4 +125,4 @@ ERROR: sodium-malloc-error ;
     sodium_bin2base64 0 = [ call-fail ] when b64 ascii decode unclip-last
     CHAR: \0 = [ call-fail ] unless ;
 
-[ sodium-init ] "sodium" add-startup-hook
+STARTUP-HOOK: sodium-init