Cleanup some uses of global [ ] bind.

diff --git a/basis/game/input/dinput/dinput.factor b/basis/game/input/dinput/dinput.factor
index 3b7981780b279cddf3b14514fb1b6f96ed002fd9..594dc8c059d09226b57011f7668663d1cc3394c6 100755 (executable)
--- a/basis/game/input/dinput/dinput.factor
+++ b/basis/game/input/dinput/dinput.factor
@@ -245,13 +245,13 @@ M: dinput-game-input-backend (close-game-input)
     delete-dinput ;
 
 M: dinput-game-input-backend (reset-game-input)
-    global [
+    [
         {
             +dinput+ +keyboard-device+ +keyboard-state+
             +controller-devices+ +controller-guids+
             +device-change-window+ +device-change-handle+
         } [ off ] each
-    ] bind ;
+    ] with-global ;
 
 M: dinput-game-input-backend get-controllers
     +controller-devices+ get-global

diff --git a/basis/game/input/xinput/xinput.factor b/basis/game/input/xinput/xinput.factor
index 800b2c4720376451084509fbcbcd66eb7a9a52a5..2f597d0d127fb9d0bea4c4bd2cfdef5cee2fde62 100644 (file)
--- a/basis/game/input/xinput/xinput.factor
+++ b/basis/game/input/xinput/xinput.factor
@@ -84,13 +84,13 @@ M: xinput-game-input-backend (close-game-input)
     FALSE XInputEnable ;
 
 M: xinput-game-input-backend (reset-game-input)
-    global [
+    [
         {
             +dinput+ +keyboard-device+ +keyboard-state+
             +controller-devices+ +controller-guids+
             +device-change-window+ +device-change-handle+
         } [ off ] each
-    ] bind ;
+    ] with-global ;
 
 M: xinput-game-input-backend get-controllers
     { 0 1 2 3 } ;

diff --git a/basis/ui/tools/deploy/deploy.factor b/basis/ui/tools/deploy/deploy.factor
index 8b877336e9c7e9b0462bcaa44365d9d04e6539dc..e0d600748dd351d1342d7b6afeba9afe1f6164c5 100644 (file)
--- a/basis/ui/tools/deploy/deploy.factor
+++ b/basis/ui/tools/deploy/deploy.factor
@@ -45,20 +45,18 @@ TUPLE: deploy-gadget < pack vocab settings ;
     1 >>fill ;
 
 : <deploy-settings> ( vocab -- control )
-    default-config [ <model> ] assoc-map
-        [
-            <pile>
-            bundle-name
-            deploy-ui
-            deploy-console
-            io-settings
-            reflection-settings
-            advanced-settings
-
-            deploy-settings-theme
-            namespace <mapping> >>model
-        ]
-    bind ;
+    default-config [ <model> ] assoc-map [
+        <pile>
+        bundle-name
+        deploy-ui
+        deploy-console
+        io-settings
+        reflection-settings
+        advanced-settings
+
+        deploy-settings-theme
+        namespace <mapping> >>model
+    ] bind ;
 
 : find-deploy-gadget ( gadget -- deploy-gadget )
     [ deploy-gadget? ] find-parent ;

diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index 036a34734f5cfb71f0748a8b2bca17c078fb1ddb..eff14b2f962b4201e62b43547fb46cc02dd3eceb 100755 (executable)
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -114,7 +114,7 @@ call( -- )
 
 ! Builtin classes
 : lookup-type-number ( word -- n )
-    global [ target-word ] bind type-number ;
+    [ target-word ] with-global type-number ;
 
 : register-builtin ( class -- )
     [ dup lookup-type-number "type" set-word-prop ]

diff --git a/core/compiler/units/units-tests.factor b/core/compiler/units/units-tests.factor
index 72a504e91ac6b94f9a3559e31514c5f3f45eabdf..51b753772e6d26f6f99a806aaf0adbf77bde0e8a 100644 (file)
--- a/core/compiler/units/units-tests.factor
+++ b/core/compiler/units/units-tests.factor
@@ -38,7 +38,8 @@ SYMBOL: counter
 
 0 counter set-global
 
-M: observer definitions-changed 2drop global [ counter inc ] bind ;
+M: observer definitions-changed
+    2drop [ counter inc ] with-global ;
 
 [ gensym [ ] ( -- ) define-declared ] with-compilation-unit