namespaces: Rename ``bind`` to ``with-variables``. Update a few places that called ``global [ ] with-variables`` to use ``with-global``.

basis/compiler/cfg/intrinsics/simd/simd-tests.factor

@@ -68,21 +68,21 @@ IN: compiler.cfg.intrinsics.simd.tests
 : test-emit ( cpu rep quot -- node )
     [
         [ new \ cpu ] 2dip '[
-            test-compiler-env [ _ test-node @ ] bind
+            test-compiler-env [ _ test-node @ ] with-variables
         ] with-variable
     ] make-classes ; inline
 
 : test-emit-literal ( cpu lit rep quot -- node )
     [
         [ new \ cpu ] 3dip '[
-            test-compiler-env [ _ _ test-node-literal @ ] bind
+            test-compiler-env [ _ _ test-node-literal @ ] with-variables
         ] with-variable
     ] make-classes ; inline
 
 : test-emit-nonliteral-rep ( cpu quot -- node )
     [
         [ new \ cpu ] dip '[
-            test-compiler-env [ test-node-nonliteral-rep @ ] bind
+            test-compiler-env [ test-node-nonliteral-rep @ ] with-variables
         ] with-variable
     ] make-classes ; inline
 

basis/compiler/tests/codegen.factor

@@ -51,7 +51,7 @@ unit-test
 
 [ 3 ]
 [
-    global [ 3 \ foo set ] bind
+    global [ 3 \ foo set ] with-variables
     \ foo [ global >n get namespaces.private:ndrop ] compile-call
 ] unit-test
 
@@ -59,20 +59,20 @@ unit-test
 
 [ 3 ]
 [
-    global [ 3 \ foo set ] bind
+    global [ 3 \ foo set ] with-variables
     \ foo [ global [ get ] swap blech call ] compile-call
 ] unit-test
 
 [ 3 ]
 [
-    global [ 3 \ foo set ] bind
+    global [ 3 \ foo set ] with-variables
     \ foo [ global [ get ] swap >n call namespaces.private:ndrop ] compile-call
 ] unit-test
 
 [ 3 ]
 [
-    global [ 3 \ foo set ] bind
-    \ foo [ global [ get ] bind ] compile-call
+    global [ 3 \ foo set ] with-variables
+    \ foo [ global [ get ] with-variables ] compile-call
 ] unit-test
 
 [ 12 13 ] [

basis/compiler/tree/debugger/debugger.factor

@@ -187,7 +187,7 @@ SYMBOL: node-count
         } [
             nl print get keys natural-sort stack.
         ] assoc-each
-    ] bind ;
+    ] with-variables ;
 
 : optimizer-report. ( word -- )
     make-report report. ;

basis/compiler/tree/propagation/branches/branches.factor

@@ -74,7 +74,7 @@ SYMBOL: infer-children-data
             _ [
                 dup +bottom+ eq?
                 [ drop null-info ] [ value-info ] if
-            ] bind
+            ] with-variables
         ] map
     ] 2map ;
 

basis/io/monitors/recursive/recursive-tests.factor

@@ -26,7 +26,7 @@ M: mock-io-backend (monitor)
     ] if ;
 
 M: mock-io-backend link-info
-    global [ link-info ] bind ;
+    global [ link-info ] with-variables ;
 
 [ ] [ 0 counter boa dummy-monitor-created set ] unit-test
 [ ] [ 0 counter boa dummy-monitor-disposed set ] unit-test

basis/io/sockets/unix/unix.factor

@@ -7,7 +7,6 @@ io.encodings.utf8 io.files.private io.pathnames
 io.sockets.private io.streams.duplex kernel libc locals math
 math.parser sequences system threads unix unix.ffi
 vocabs ;
-EXCLUDE: namespaces => bind ;
 EXCLUDE: io => read write ;
 EXCLUDE: io.sockets => accept ;
 IN: io.sockets.unix

basis/locals/parser/parser.factor

@@ -46,10 +46,10 @@ SYMBOL: locals
     ?rewrite-closures ;
 
 : parse-multi-def ( locals -- multi-def )
-    [ ")" [ make-local ] map-tokens ] bind <multi-def> ;
+    [ ")" [ make-local ] map-tokens ] with-variables <multi-def> ;
 
 : parse-def ( name/paren locals -- def )
-    over "(" = [ nip parse-multi-def ] [ [ make-local ] bind <def> ] if ;
+    over "(" = [ nip parse-multi-def ] [ [ make-local ] with-variables <def> ] if ;
 
 M: lambda-parser parse-quotation ( -- quotation )
     H{ } clone (parse-lambda) ;

basis/match/match-tests.factor

@@ -50,13 +50,13 @@ C: <foo> foo
 { 1 2 } [
   1 2 <foo> T{ foo f ?a ?b } match [
     ?a ?b
-  ] bind
+  ] with-variables
 ] unit-test
 
 { 1 2 } [
   1 2 <foo> \ ?a \ ?b <foo> match [
     ?a ?b
-  ] bind
+  ] with-variables
 ] unit-test
 
 { H{ { ?a ?a } } } [ 

basis/match/match.factor

@@ -48,7 +48,7 @@ MACRO: match-cond ( assoc -- )
     [
         first2
         [ [ dupd match ] curry ] dip
-        [ bind ] curry rot
+        [ with-variables ] curry rot
         [ ?if ] 2curry append
     ] reduce ;
 
@@ -63,7 +63,7 @@ MACRO: match-cond ( assoc -- )
 
 : match-replace ( object pattern1 pattern2 -- result )
     [ match [ "Pattern does not match" throw ] unless* ] dip swap
-    [ replace-patterns ] bind ;
+    [ replace-patterns ] with-variables ;
 
 : ?1-tail ( seq -- tail/f )
     dup length zero? not [ rest ] [ drop f ] if ;

basis/mirrors/mirrors-tests.factor

@@ -26,11 +26,11 @@ C: <foo> foo
     gensym [
         <mirror> [
             "foo" "name" set
-        ] bind
+        ] with-variables
     ] [ name>> ] bi
 ] unit-test
 
-[ gensym <mirror> [ "compiled" off ] bind ] must-fail
+[ gensym <mirror> [ "compiled" off ] with-variables ] must-fail
 
 TUPLE: declared-mirror-test
 { a integer initial: 0 } ;
@@ -39,10 +39,10 @@ TUPLE: declared-mirror-test
     3 declared-mirror-test boa <mirror> [
         5 "a" set
         "a" get
-    ] bind
+    ] with-variables
 ] unit-test
 
-[ 3 declared-mirror-test boa <mirror> [ t "a" set ] bind ] must-fail
+[ 3 declared-mirror-test boa <mirror> [ t "a" set ] with-variables ] must-fail
 
 TUPLE: color
 { red integer }

basis/peg/ebnf/ebnf.factor

@@ -381,7 +381,7 @@ SYMBOL: ignore-ws
     parser set 
     swap (transform) 
     main set 
-  ] bind ;
+  ] with-variables ;
 
 M: ebnf (transform) ( ast -- parser )
   rules>> [ (transform) ] map last ;

basis/tools/deploy/backend/backend.factor

@@ -112,7 +112,7 @@ DEFER: ?make-staging-image
             "-output-image=" prepend ,
             "-pic=0" ,
         ] { } make
-    ] bind ;
+    ] with-variables ;
 
 : parse-vocab-manifest-file ( path -- vocab-manifest )
     utf8 file-lines [ "empty vocab manifest!" throw ] [

basis/tools/deploy/deploy-tests.factor

@@ -30,7 +30,7 @@ cache-directory [
     "hello-ui" deploy-config [
         bootstrap-profile staging-image-name file-name
         "." split second
-    ] bind
+    ] with-variables
 ] unit-test
 
 [ ] [ "maze" shake-and-bake 1200000 small-enough? ] unit-test

basis/tools/deploy/macosx/macosx.factor

@@ -84,11 +84,11 @@ IN: tools.deploy.macosx
             [ "Contents/Resources" copy-resources ]
             [ "Contents/Frameworks" copy-libraries ] 2bi
             bundle-name show-in-finder
-        ] bind
+        ] with-variables
     ] with-directory ;
 
 : deploy-app-bundle? ( vocab -- ? )
-    deploy-config [ deploy-console? get not deploy-ui? get or ] bind ;
+    deploy-config [ deploy-console? get not deploy-ui? get or ] with-variables ;
 
 M: macosx deploy* ( vocab -- )
     ! pass off to M: unix deploy* if we're building a console app

basis/tools/deploy/shaker/shaker.factor

@@ -640,7 +640,7 @@ SYMBOL: deploy-vocab
             "Saving final image" show
             save-image-and-exit
         ] deploy-error-handler
-    ] bind ;
+    ] with-variables ;
 
 : do-deploy ( -- )
     "output-image" get

basis/tools/deploy/shaker/strip-cocoa.factor

@@ -14,7 +14,7 @@ IN: tools.deploy.shaker.cocoa
 : pool-values ( assoc -- assoc' ) [ pool-array ] assoc-map ;
 
 H{ } clone \ pool [
-    global [
+    [
         ! Only keeps those methods that we actually call
         sent-messages get super-sent-messages get assoc-union
         objc-methods [ assoc-intersect pool-values ] change
@@ -34,7 +34,7 @@ H{ } clone \ pool [
         ! We need this for strip-stack-traces to work fully
         { message-senders super-message-senders }
         [ get values compile ] each
-    ] bind
+    ] with-global
 ] with-variable
 
 \ make-prepare-send reset-memoized

basis/tools/deploy/unix/unix.factor

@@ -22,5 +22,5 @@ M: unix deploy* ( vocab -- )
             bundle-name "" [ copy-resources ] [ copy-libraries ] 3bi
             bundle-name normalize-path "Binary deployed to " "." surround print
             bundle-name webbrowser:open-file
-        ] bind
+        ] with-variables
     ] with-directory ;

basis/tools/deploy/windows/windows.factor

@@ -40,5 +40,5 @@ M: windows deploy*
                 [ nip "" [ copy-resources ] [ copy-libraries ] 3bi ]
                 [ nip open-in-explorer ]
             } 2cleave 
-        ] bind
+        ] with-variables
     ] with-directory ;

basis/ui/tools/deploy/deploy.factor

@@ -49,7 +49,7 @@ TUPLE: deploy-gadget < pack vocab settings ;
 
         deploy-settings-theme
         namespace <mapping> >>model
-    ] bind ;
+    ] with-variables ;
 
 : find-deploy-gadget ( gadget -- deploy-gadget )
     [ deploy-gadget? ] find-parent ;

basis/xml-rpc/xml-rpc.factor

@@ -161,7 +161,7 @@ TAG: array xml>item
 
 : parse-fault ( xml -- fault-code fault-string )
     first-child-tag first-child-tag first-child-tag
-    xml>item [ "faultCode" get "faultString" get ] bind ;
+    xml>item [ "faultCode" get "faultString" get ] with-variables ;
 
 : receive-rpc ( xml -- rpc )
     dup main>> dup "methodCall" =

basis/xml/syntax/inverse/inverse.factor

@@ -69,6 +69,6 @@ M: interpolated [undo-xml]
     sort-keys values <enum> ;
 
 : undo-xml ( xml -- quot )
-    [undo-xml] '[ H{ } clone [ _ bind ] keep >enum ] ;
+    [undo-xml] '[ H{ } clone [ _ with-variables ] keep >enum ] ;
 
 \ interpolate-xml 1 [ undo-xml ] define-pop-inverse

basis/xml/xml.factor

@@ -120,7 +120,7 @@ TUPLE: pull-xml scope ;
         text-now? get [ parse-text f ] [
             get-char [ make-tag t ] [ f f ] if
         ] if text-now? set
-    ] bind ;
+    ] with-variables ;
 
 <PRIVATE
 

core/namespaces/namespaces-docs.factor

@@ -8,7 +8,7 @@ ARTICLE: "namespaces-combinators" "Namespace combinators"
     make-assoc
     with-scope
     with-variable
-    bind
+    with-variables
 } ;
 
 ARTICLE: "namespaces-change" "Changing variable values"
@@ -150,7 +150,7 @@ HELP: make-assoc
 { $values { "quot" quotation } { "exemplar" assoc } { "hash" "a new assoc" } }
 { $description "Calls the quotation in a new namespace of the same type as " { $snippet "exemplar" } ", and outputs this namespace when the quotation returns. Useful for quickly building assocs." } ;
 
-HELP: bind
+HELP: with-variables
 { $values { "ns" assoc } { "quot" quotation } }
 { $description "Calls the quotation in the dynamic scope of " { $snippet "ns" } ". When variables are looked up by the quotation, " { $snippet "ns" } " is checked first, and setting variables in the quotation stores them in " { $snippet "ns" } "." } ;
 

core/namespaces/namespaces-tests.factor

@@ -5,13 +5,13 @@ IN: namespaces.tests
 H{ } clone "test-namespace" set
 
 : test-namespace ( -- ? )
-    H{ } clone dup [ namespace = ] bind ;
+    H{ } clone dup [ namespace = ] with-variables ;
 
 [ t ] [ test-namespace ] unit-test
 
 10 "some-global" set
 [ f ]
-[ H{ } clone [ f "some-global" set "some-global" get ] bind ]
+[ H{ } clone [ f "some-global" set "some-global" get ] with-variables ]
 unit-test
 
 SYMBOL: test-initialize

core/namespaces/namespaces.factor

@@ -55,10 +55,11 @@ PRIVATE>
 : +@ ( n variable -- ) [ 0 or + ] change ; inline
 : inc ( variable -- ) 1 swap +@ ; inline
 : dec ( variable -- ) -1 swap +@ ; inline
-: bind ( ns quot -- ) swap >n call ndrop ; inline
+: with-variables ( ns quot -- ) swap >n call ndrop ; inline
 : counter ( variable -- n ) [ 0 or 1 + dup ] change-global ;
-: make-assoc ( quot exemplar -- hash ) 20 swap new-assoc [ swap bind ] keep ; inline
-: with-scope ( quot -- ) 5 <hashtable> swap bind ; inline
-: with-variable ( value key quot -- ) [ associate ] dip bind ; inline
-: with-global ( quot -- ) global swap bind ; inline
+: make-assoc ( quot exemplar -- hash ) 20 swap new-assoc [ swap with-variables ] keep ; inline
+: with-scope ( quot -- ) 5 <hashtable> swap with-variables ; inline
+: with-variable ( value key quot -- ) [ associate ] dip with-variables ; inline
+: with-new-scope ( quot -- ) 5 <hashtable> swap with-variables ; inline
+: with-global ( quot -- ) [ global ] dip with-variables ; inline
 : initialize ( variable quot -- ) [ unless* ] curry change-global ; inline

core/vocabs/loader/test/a/a.factor

@@ -1,7 +1,7 @@
 USING: namespaces parser ;
 IN: vocabs.loader.test.a
 
-<< global [ "count-me" inc ] bind >>
+<< global [ "count-me" inc ] with-variables >>
 
 : v-l-t-a-hello ( -- a ) 4 ;
 

core/vocabs/loader/test/b/b.factor

@@ -1,6 +1,6 @@
 USING: namespaces ;
 IN: vocabs.loader.test.b
 
-<< global [ "count-me" inc ] bind >>
+<< global [ "count-me" inc ] with-variables >>
 
 : fred bob ;

core/vocabs/loader/test/g/g.factor

@@ -1,4 +1,4 @@
 IN: vocabs.loader.test.g
 USING: vocabs.loader.test.f namespaces ;
 
-global [ "vocabs.loader.test.g" inc ] bind
+[ "vocabs.loader.test.g" inc ] with-global

extra/coroutines/coroutines.factor

@@ -11,7 +11,7 @@ TUPLE: coroutine resumecc exitcc originalcc ;
 : cocreate ( quot -- co )
   coroutine new
   dup current-coro associate
-  [ swapd , , \ bind , 
+  [ swapd , , \ with-variables , 
     "Coroutine has terminated illegally." , \ throw ,
   ] [ ] make
   [ >>resumecc ] [ >>originalcc ] bi ;

extra/fastcgi/fastcgi.factor

@@ -63,7 +63,7 @@ ENUM: fcgi-protocol-status
     FCGI_UNKNOWN_ROLE ;
 
 :: debug-print ( print-quot -- )
-    global [ print-quot call flush ] bind ; inline
+    [ print-quot call flush ] with-global ; inline
 
 ! read either a 1 byte or 4 byte big endian integer
 : read-var-int ( -- n/f )

extra/fjsc/resources/bootstrap.factor

@@ -1,6 +1,6 @@
 IN: namespaces
 USE: kernel-internals
-: bind ( ns quot -- )
+: with-variables ( ns quot -- )
   swap >n call n> drop ;
 
 "browser-dom" set-in
@@ -14,7 +14,7 @@ USE: kernel-internals
   { } "" "html" { "string" } alien-invoke ;
 
 : bind-event ( name element quot -- )
-  >function swap { } "" "bind" { "string" "function" } alien-invoke ;
+  >function swap { } "" "with-variables" { "string" "function" } alien-invoke ;
 
 "scratchpad" set-in
 

extra/game/models/collada/collada.factor

@@ -159,7 +159,7 @@ VERTEX-FORMAT: collada-vertex-format
     [
         { { up-axis y-up } { unit-ratio 1 } } [
             mesh>sources
-        ] bind
+        ] with-variables
     ]
     [ mesh>vertices ]
     [ mesh>triangles ] tri ;

extra/game/models/obj/obj.factor

@@ -82,7 +82,7 @@ TUPLE: material
     [
         ascii file-lines [ line>mtl ] each
         md
-    ] bind ;
+    ] with-variables ;
 
 VERTEX-FORMAT: obj-vertex-format
     { "POSITION" float-components 3 f }
@@ -162,5 +162,5 @@ M: obj-models stream>models
     [
         [ line>obj ] each-stream-line push-current-model
         models get
-    ] bind ;
+    ] with-variables ;
 

extra/monads/monads-tests.factor

@@ -10,7 +10,7 @@ IN: monads.tests
 ] unit-test
 
 [ nothing ] [
-    111 just [ maybe-monad fail ] bind
+    111 just [ maybe-monad fail ] with-variables
 ] unit-test
 
 [ 100 ] [
@@ -26,7 +26,7 @@ IN: monads.tests
 ] unit-test
 
 [ { } ] [
-    { 1 2 3 } [ drop "OOPS" array-monad fail ] bind
+    { 1 2 3 } [ drop "OOPS" array-monad fail ] with-variables
 ] unit-test
 
 [ 5 ] [
@@ -34,7 +34,7 @@ IN: monads.tests
 ] unit-test
 
 [ 8 ] [
-    5 state-monad return [ 3 + state-monad return ] bind
+    5 state-monad return [ 3 + state-monad return ] with-variables
     "initial state" run-st
 ] unit-test
 
@@ -52,9 +52,9 @@ IN: monads.tests
 
 [ 15 ] [
     f state-monad return
-    [ drop get-st ] bind
-    [ 4 + put-st ] bind
-    [ drop get-st ] bind
+    [ drop get-st ] with-variables
+    [ 4 + put-st ] with-variables
+    [ drop get-st ] with-variables
     11 run-st
 ] unit-test
 
@@ -104,12 +104,12 @@ LAZY: nats-from ( n -- list )
 ] unit-test
 
 [ 6 ] [
-    f reader-monad return [ drop ask ] bind [ 1 + ] local 5 run-reader
+    f reader-monad return [ drop ask ] with-variables [ 1 + ] local 5 run-reader
 ] unit-test
 
 [ f { 1 2 3 } ] [
     5 writer-monad return
-    [ drop { 1 2 3 } tell ] bind
+    [ drop { 1 2 3 } tell ] with-variables
     run-writer
 ] unit-test
 

extra/opencl/opencl.factor

@@ -423,7 +423,7 @@ PRIVATE>
             [ cl-current-device  set ] when*
             [ cl-current-context set ] when*
         ] 3curry H{ } make-assoc
-    ] dip bind ; inline
+    ] dip with-variable ; inline
 
 : cl-platforms ( -- platforms )
     0 f 0 uint <ref> [ clGetPlatformIDs cl-success ] keep uint deref

extra/slides/slides.factor

@@ -68,7 +68,7 @@ CONSTANT: stylesheet
     [
         stylesheet clone [
             [ print-element ] with-default-style
-        ] bind
+        ] with-variables
     ] make-pane
     dup page-theme ;
 

extra/tc-lisp-talk/tc-lisp-talk.factor

@@ -115,7 +115,7 @@ M: circle perimeter radius>> pi * 2 * ;"""
         { "Useful words are " { $link get-global } ", " { $link set-global } }
         "Factor idiom for changing a particular namespace"
         { $code """SYMBOL: king
-global [ "Henry VIII" king set ] bind"""
+global [ "Henry VIII" king set ] with-variables"""
         }
         { $code "with-scope" }
         { $code "namestack" }