diff --git a/basis/game/input/dinput/dinput.factor b/basis/game/input/dinput/dinput.factor index 3b7981780b..594dc8c059 100755 --- 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 800b2c4720..2f597d0d12 100644 --- 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 8b877336e9..e0d600748d 100644 --- 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 ; : ( vocab -- control ) - default-config [ ] assoc-map - [ - - bundle-name - deploy-ui - deploy-console - io-settings - reflection-settings - advanced-settings + default-config [ ] assoc-map [ + + bundle-name + deploy-ui + deploy-console + io-settings + reflection-settings + advanced-settings - deploy-settings-theme - namespace >>model - ] - bind ; + deploy-settings-theme + namespace >>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 036a34734f..eff14b2f96 100755 --- 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 72a504e91a..51b753772e 100644 --- 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