disambiguate namespaces:set and sets:set.

diff --git a/basis/compiler/cfg/alias-analysis/alias-analysis.factor b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
index fcc42fec224bd4de7c2dcfc3270907a39ec1c861..bd5d9fa98330f546497004534a2aa3706f622dd8 100644 (file)
--- a/basis/compiler/cfg/alias-analysis/alias-analysis.factor
+++ b/basis/compiler/cfg/alias-analysis/alias-analysis.factor
@@ -125,13 +125,13 @@ SYMBOL: ac-counter
     ] [ vreg kill-computed-set-slot ] if ;
 
 : init-alias-analysis ( -- )
-    H{ } clone vregs>acs set
-    H{ } clone acs>vregs set
-    H{ } clone live-slots set
-    H{ } clone copies set
-    H{ } clone recent-stores set
-    HS{ } clone dead-stores set
-    0 ac-counter set ;
+    H{ } clone vregs>acs namespaces:set
+    H{ } clone acs>vregs namespaces:set
+    H{ } clone live-slots namespaces:set
+    H{ } clone copies namespaces:set
+    H{ } clone recent-stores namespaces:set
+    HS{ } clone dead-stores namespaces:set
+    0 ac-counter namespaces:set ;
 
 GENERIC: insn-slot# ( insn -- slot#/f )
 GENERIC: insn-object ( insn -- vreg )
@@ -255,7 +255,7 @@ M: insn eliminate-dead-stores drop t ;
     copies get clear-assoc
     dead-stores get clear-set
 
-    next-ac heap-ac set
+    next-ac heap-ac namespaces:set
     ##vm-field set-new-ac
     ##alien-global set-new-ac ;
 

diff --git a/basis/compiler/cfg/branch-splitting/branch-splitting.factor b/basis/compiler/cfg/branch-splitting/branch-splitting.factor
index 78af21546a0d4a422d41a2fb7c861ed38c629894..f58a375430708e8628ae4e607537ec2baa683a5a 100644 (file)
--- a/basis/compiler/cfg/branch-splitting/branch-splitting.factor
+++ b/basis/compiler/cfg/branch-splitting/branch-splitting.factor
@@ -85,8 +85,8 @@ SYMBOL: visited
     [ worklist get push-front ] [ drop ] if ;
 
 : init-worklist ( cfg -- )
-    <dlist> worklist set
-    HS{ } clone visited set
+    <dlist> worklist namespaces:set
+    HS{ } clone visited namespaces:set
     entry>> add-to-worklist ;
 
 : split-branches ( cfg -- )

diff --git a/basis/compiler/cfg/dce/dce.factor b/basis/compiler/cfg/dce/dce.factor
index 8a515e1e90de93b6de740699477a65a82c090837..d2d776e39319c31223a71dac4692dd3344f1e3d6 100644 (file)
--- a/basis/compiler/cfg/dce/dce.factor
+++ b/basis/compiler/cfg/dce/dce.factor
@@ -21,9 +21,9 @@ SYMBOL: allocations
     allocations get in? ;
 
 : init-dead-code ( -- )
-    H{ } clone liveness-graph set
-    HS{ } clone live-vregs set
-    HS{ } clone allocations set ;
+    H{ } clone liveness-graph namespaces:set
+    HS{ } clone live-vregs namespaces:set
+    HS{ } clone allocations namespaces:set ;
 
 GENERIC: build-liveness-graph ( insn -- )
 

diff --git a/basis/compiler/cfg/def-use/def-use.factor b/basis/compiler/cfg/def-use/def-use.factor
index 7b88a1ca92a5ea885c30cdb08d1d468f28f318ca..e9210cb6d0ab9a15c0d13c23e5331c7763276f2d 100644 (file)
--- a/basis/compiler/cfg/def-use/def-use.factor
+++ b/basis/compiler/cfg/def-use/def-use.factor
@@ -110,7 +110,7 @@ SYMBOLS: defs insns ;
                 _ set-def-of
             ] with each
         ] simple-analysis
-    ] keep defs set ;
+    ] keep defs namespaces:set ;
 
 : compute-insns ( cfg -- )
     H{ } clone [
@@ -119,4 +119,4 @@ SYMBOLS: defs insns ;
                 dup _ set-def-of
             ] each
         ] simple-analysis
-    ] keep insns set ;
+    ] keep insns namespaces:set ;

diff --git a/basis/compiler/cfg/linear-scan/assignment/assignment.factor b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
index e40b41c6b6f3740bb0ca9cf591b40440030854b5..a30d4267cdc6be06a3aad4fa85a16f5577f0dee1 100644 (file)
--- a/basis/compiler/cfg/linear-scan/assignment/assignment.factor
+++ b/basis/compiler/cfg/linear-scan/assignment/assignment.factor
@@ -117,7 +117,7 @@ M: insn assign-registers-in-insn drop ;
 
 : begin-block ( bb -- )
     {
-        [ basic-block set ]
+        [ basic-block namespaces:set ]
         [ block-from activate-new-intervals ]
         [ compute-edge-live-in ]
         [ compute-live-in ]
@@ -139,12 +139,12 @@ M: insn assign-registers-in-insn drop ;
     ] change-instructions compute-live-out ;
 
 : init-assignment ( live-intervals -- )
-    [ [ start>> ] map ] keep zip >min-heap unhandled-intervals set
-    <min-heap> pending-interval-heap set
-    H{ } clone pending-interval-assoc set
-    H{ } clone machine-live-ins set
-    H{ } clone machine-edge-live-ins set
-    H{ } clone machine-live-outs set ;
+    [ [ start>> ] map ] keep zip >min-heap unhandled-intervals namespaces:set
+    <min-heap> pending-interval-heap namespaces:set
+    H{ } clone pending-interval-assoc namespaces:set
+    H{ } clone machine-live-ins namespaces:set
+    H{ } clone machine-edge-live-ins namespaces:set
+    H{ } clone machine-live-outs namespaces:set ;
 
 : assign-registers ( cfg live-intervals -- )
     init-assignment

diff --git a/basis/compiler/cfg/linearization/linearization.factor b/basis/compiler/cfg/linearization/linearization.factor
index 332c18bdcb99bddbc4b5b23028a68b9d57277a1f..c1e29450a06aa0080faeaf909af047e44d9d0d7c 100644 (file)
--- a/basis/compiler/cfg/linearization/linearization.factor
+++ b/basis/compiler/cfg/linearization/linearization.factor
@@ -47,7 +47,7 @@ SYMBOLS: loop-heads visited ;
     [ visited? ] reject ;
 
 : (linearization-order) ( cfg -- bbs )
-    HS{ } clone visited set
+    HS{ } clone visited namespaces:set
     entry>> <dlist> [ push-back ] keep
     [ dup '[ process-block _ push-all-back ] slurp-deque ] { } make ;
 

diff --git a/basis/compiler/cfg/liveness/liveness.factor b/basis/compiler/cfg/liveness/liveness.factor
index 67c5cb3b9c607ade4cedaf3105743f2dd1e41538..d8eb1614b94e813cec24a7facfc7c0428a5c505f 100644 (file)
--- a/basis/compiler/cfg/liveness/liveness.factor
+++ b/basis/compiler/cfg/liveness/liveness.factor
@@ -137,10 +137,10 @@ M: insn visit-insn 2drop ;
     [ update-live-out/in ] keep predecessors>> { } ? ;
 
 : init-liveness ( -- )
-    H{ } clone live-ins set
-    H{ } clone edge-live-ins set
-    H{ } clone live-outs set
-    H{ } clone base-pointers set ;
+    H{ } clone live-ins namespaces:set
+    H{ } clone edge-live-ins namespaces:set
+    H{ } clone live-outs namespaces:set
+    H{ } clone base-pointers namespaces:set ;
 
 : compute-live-sets ( cfg -- )
     init-liveness

diff --git a/basis/compiler/cfg/loop-detection/loop-detection.factor b/basis/compiler/cfg/loop-detection/loop-detection.factor
index 7e4ccdac8fc854b9dbeee2994d892894fb6ee3de..672c0b24f2ca135f9d2ba0191dbf5940d56963a5 100644 (file)
--- a/basis/compiler/cfg/loop-detection/loop-detection.factor
+++ b/basis/compiler/cfg/loop-detection/loop-detection.factor
@@ -55,13 +55,13 @@ SYMBOL: loop-nesting
 : compute-loop-nesting ( -- )
     loops get H{ } clone [
         [ values ] dip '[ blocks>> members [ _ inc-at ] each ] each
-    ] keep loop-nesting set ;
+    ] keep loop-nesting namespaces:set ;
 
 : detect-loops ( cfg -- cfg' )
-    H{ } clone loops set
-    HS{ } clone visited set
-    HS{ } clone active set
-    H{ } clone loop-nesting set
+    H{ } clone loops namespaces:set
+    HS{ } clone visited namespaces:set
+    HS{ } clone active namespaces:set
+    H{ } clone loop-nesting namespaces:set
     [ needs-predecessors ]
     [ entry>> find-loop-headers process-loop-headers compute-loop-nesting ]
     [ ] tri ;

diff --git a/basis/compiler/cfg/representations/selection/selection.factor b/basis/compiler/cfg/representations/selection/selection.factor
index cdb10598c634f1c5c80908ca0139ef2af0545122..1192c6d07571ef483aa66044d9545ec46454b4f4 100644 (file)
--- a/basis/compiler/cfg/representations/selection/selection.factor
+++ b/basis/compiler/cfg/representations/selection/selection.factor
@@ -39,8 +39,8 @@ M: vreg-insn (collect-vreg-reps)
 M: insn (collect-vreg-reps) drop ;
 
 : collect-vreg-reps ( cfg -- )
-    H{ } clone vreg-reps set
-    HS{ } clone tagged-vregs set
+    H{ } clone vreg-reps namespaces:set
+    HS{ } clone tagged-vregs namespaces:set
     [ [ (collect-vreg-reps) ] each-non-phi ] each-basic-block ;
 
 SYMBOL: possibilities
@@ -52,7 +52,7 @@ SYMBOL: possibilities
 
 : compute-possibilities ( cfg -- )
     collect-vreg-reps
-    vreg-reps get [ possible-reps ] assoc-map possibilities set ;
+    vreg-reps get [ possible-reps ] assoc-map possibilities namespaces:set ;
 
 ! For every vreg, compute the cost of keeping it in every possible
 ! representation.
@@ -60,7 +60,7 @@ SYMBOL: possibilities
 SYMBOL: costs
 
 : init-costs ( -- )
-    possibilities get [ [ 0 ] H{ } map>assoc ] assoc-map costs set ;
+    possibilities get [ [ 0 ] H{ } map>assoc ] assoc-map costs namespaces:set ;
 
 : increase-cost ( rep scc factor -- )
     [ costs get at 2dup key? ] dip
@@ -121,7 +121,7 @@ M: vreg-insn compute-insn-costs
 : compute-costs ( cfg -- )
     init-costs
     [
-        [ basic-block set ]
+        [ basic-block namespaces:set ]
         [ [ compute-insn-costs ] each-non-phi ] bi
     ] each-basic-block ;
 
@@ -133,4 +133,4 @@ M: vreg-insn compute-insn-costs
     compute-costs costs get minimize-costs
     [ components get [ disjoint-set-members ] keep ] dip
     '[ dup _ representative _ at ] H{ } map>assoc
-    representations set ;
+    representations namespaces:set ;

diff --git a/basis/compiler/cfg/rpo/rpo.factor b/basis/compiler/cfg/rpo/rpo.factor
index 0a36c5decce59121cf3eb058b74a1a871f0520ef..402d74d6cb74cc803383503d2070c24b452b1830 100644 (file)
--- a/basis/compiler/cfg/rpo/rpo.factor
+++ b/basis/compiler/cfg/rpo/rpo.factor
@@ -33,7 +33,7 @@ IN: compiler.cfg.rpo
 
 : optimize-basic-block ( bb quot -- )
     over kill-block?>> [ 2drop ] [
-        over basic-block set
+        over basic-block namespaces:set
         change-instructions drop
     ] if ; inline
 
@@ -42,7 +42,7 @@ IN: compiler.cfg.rpo
 
 : analyze-basic-block ( bb quot -- )
     over kill-block?>> [ 2drop ] [
-        [ dup basic-block set instructions>> ] dip call
+        [ dup basic-block namespaces:set instructions>> ] dip call
     ] if ; inline
 
 : simple-analysis ( ... cfg quot: ( ... insns -- ... ) -- ... )

diff --git a/basis/compiler/cfg/ssa/construction/construction.factor b/basis/compiler/cfg/ssa/construction/construction.factor
index 73fc2c1a0f5c7139690afe24e6368890345e854a..3699d83438584d0ac331a450a7020178578841da 100644 (file)
--- a/basis/compiler/cfg/ssa/construction/construction.factor
+++ b/basis/compiler/cfg/ssa/construction/construction.factor
@@ -25,8 +25,8 @@ M: vreg-insn compute-insn-defs
     ] with each ;
 
 : compute-defs ( cfg -- )
-    H{ } clone defs set
-    HS{ } clone defs-multi set
+    H{ } clone defs namespaces:set
+    HS{ } clone defs-multi namespaces:set
     [
         [ basic-block get ] dip
         [ compute-insn-defs ] with each
@@ -44,7 +44,7 @@ SYMBOL: inserting-phis
     members merge-set [ insert-phi-later ] with each ;
 
 : compute-phis ( -- )
-    H{ } clone inserting-phis set
+    H{ } clone inserting-phis namespaces:set
     defs-multi get members
     defs get '[ dup _ at compute-phis-for ] each ;
 
@@ -55,9 +55,9 @@ SYMBOL: used-vregs
 SYMBOLS: stacks pushed ;
 
 : init-renaming ( -- )
-    H{ } clone phis set
-    <hashed-dlist>  used-vregs set
-    H{ } clone stacks set ;
+    H{ } clone phis namespaces:set
+    <hashed-dlist>  used-vregs namespaces:set
+    H{ } clone stacks namespaces:set ;
 
 : gen-name ( vreg -- vreg' )
     [ next-vreg dup ] dip
@@ -109,7 +109,7 @@ M: vreg-insn rename-insn
     pushed get members stacks get '[ _ at pop* ] each ;
 
 : rename-in-block ( bb -- )
-    HS{ } clone pushed set
+    HS{ } clone pushed namespaces:set
     {
         [ rename-phis ]
         [ rename-insns ]
@@ -117,7 +117,7 @@ M: vreg-insn rename-insn
         [
             pushed get
             [ dom-children [ rename-in-block ] each ] dip
-            pushed set
+            pushed namespaces:set
         ]
     } cleave
     pop-stacks ;
@@ -132,7 +132,7 @@ SYMBOL: live-phis
     dst>> live-phis get in? ;
 
 : compute-live-phis ( -- )
-    HS{ } clone live-phis set
+    HS{ } clone live-phis namespaces:set
     used-vregs get [
         phis get at [
             [

diff --git a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
index d090619ca721501fa5b5aad3f55959a38a2b9d08..3d3aae705e45ed06fbb9e1ff24b942b35cb74877 100644 (file)
--- a/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
+++ b/basis/compiler/cfg/ssa/construction/tdmsc/tdmsc.factor
@@ -15,14 +15,15 @@ IN: compiler.cfg.ssa.construction.tdmsc
 SYMBOLS: merge-sets levels again? ;
 
 : init-merge-sets ( cfg -- )
-    post-order dup length '[ _ <bit-set> ] H{ } map>assoc merge-sets set ;
+    post-order dup length '[ _ <bit-set> ] H{ } map>assoc
+    merge-sets namespaces:set ;
 
 : compute-levels ( cfg -- )
     0 over entry>> associate [
         '[
             _ [ [ dom-parent ] dip at 1 + ] 2keep set-at
         ] each-basic-block
-    ] keep levels set ;
+    ] keep levels namespaces:set ;
 
 : j-edge? ( from to -- ? )
     2dup eq? [ 2drop f ] [ dominates? not ] if ;

diff --git a/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor b/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor
index c9e88cd83d888b04fe0e3f5c062893d1f94279be..22ab8d5ff84c307a76e22ad0f12980ae02e68299 100644 (file)
--- a/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor
+++ b/basis/compiler/cfg/ssa/destruction/coalescing/coalescing.factor
@@ -41,8 +41,8 @@ ERROR: vregs-shouldn't-interfere vreg1 vreg2 ;
     defs get [ [ dup dup value-of ] dip <vreg-info> 1array ] assoc-map ;
 
 : init-coalescing ( insns -- )
-    initial-leaders leader-map set
-    initial-class-elements class-element-map set ;
+    initial-leaders leader-map namespaces:set
+    initial-class-elements class-element-map namespaces:set ;
 
 GENERIC: coalesce-now ( insn -- )
 

diff --git a/basis/compiler/cfg/stacks/local/local.factor b/basis/compiler/cfg/stacks/local/local.factor
index 841f13e2c1a1ec4e885f260026ebd6d5f83c796b..16250a464c9de4f4e78b2f0586d38468876fb2aa 100644 (file)
--- a/basis/compiler/cfg/stacks/local/local.factor
+++ b/basis/compiler/cfg/stacks/local/local.factor
@@ -75,8 +75,8 @@ SYMBOLS: local-peek-set replaces ;
 : begin-local-analysis ( basic-block -- )
     height-state get dup reset-emits
     current-height rot record-stack-heights
-    HS{ } clone local-peek-set set
-    H{ } clone replaces set ;
+    HS{ } clone local-peek-set namespaces:set
+    H{ } clone replaces namespaces:set ;
 
 : remove-redundant-replaces ( replaces -- replaces' )
     [ [ loc>vreg ] dip = ] assoc-reject ;

diff --git a/basis/compiler/cfg/write-barrier/write-barrier.factor b/basis/compiler/cfg/write-barrier/write-barrier.factor
index 47d1cf9913085f6c0301a150af522e9603acbb9d..798d526391f53057ccbad04629d06da0bb38feea 100644 (file)
--- a/basis/compiler/cfg/write-barrier/write-barrier.factor
+++ b/basis/compiler/cfg/write-barrier/write-barrier.factor
@@ -54,9 +54,9 @@ M: ##copy eliminate-write-barrier
 M: insn eliminate-write-barrier drop t ;
 
 : write-barriers-step ( insns -- insns' )
-    HS{ } clone fresh-allocations set
-    HS{ } clone mutated-objects set
-    H{ } clone copies set
+    HS{ } clone fresh-allocations namespaces:set
+    HS{ } clone mutated-objects namespaces:set
+    H{ } clone copies namespaces:set
     [ eliminate-write-barrier ] filter! ;
 
 : eliminate-write-barriers ( cfg -- )

diff --git a/basis/compiler/tree/checker/checker.factor b/basis/compiler/tree/checker/checker.factor
index a099e798905dd45794b5b079aa0167c0de0dfbaa..8a15ea00e9eb066edf68e9b99363f2bf11fa8a34 100644 (file)
--- a/basis/compiler/tree/checker/checker.factor
+++ b/basis/compiler/tree/checker/checker.factor
@@ -74,8 +74,8 @@ GENERIC: check-stack-flow* ( node -- )
     [ check-stack-flow* terminated? get not ] all? drop ;
 
 : init-stack-flow ( -- )
-    V{ } clone datastack set
-    V{ } clone retainstack set ;
+    V{ } clone datastack namespaces:set
+    V{ } clone retainstack namespaces:set ;
 
 : check-stack-flow ( nodes -- )
     [
@@ -149,7 +149,7 @@ SYMBOL: branch-out
 : check-branch ( nodes -- stack )
     [
         datastack [ clone ] change
-        V{ } clone retainstack set
+        V{ } clone retainstack namespaces:set
         (check-stack-flow)
         terminated? get [ assert-retainstack-empty ] unless
         terminated? get f datastack get ?
@@ -157,7 +157,7 @@ SYMBOL: branch-out
 
 M: #branch check-stack-flow*
     [ check-in-d ]
-    [ children>> [ check-branch ] map branch-out set ]
+    [ children>> [ check-branch ] map branch-out namespaces:set ]
     bi ;
 
 : check-phi-in ( #phi -- )
@@ -174,7 +174,7 @@ M: #branch check-stack-flow*
 
 : set-phi-datastack ( #phi -- )
     phi-in-d>> first length
-    branch-out get [ ] find nip swap head* >vector datastack set ;
+    branch-out get [ ] find nip swap head* >vector datastack namespaces:set ;
 
 M: #phi check-stack-flow*
     branch-out get [ ] any? [

diff --git a/basis/compiler/tree/dead-code/liveness/liveness.factor b/basis/compiler/tree/dead-code/liveness/liveness.factor
index 234c40ff9f86fe2fa686761aced15ffc6c187157..de9a3ba40334ee50f2a39022bf2509fe6b3f225e 100644 (file)
--- a/basis/compiler/tree/dead-code/liveness/liveness.factor
+++ b/basis/compiler/tree/dead-code/liveness/liveness.factor
@@ -18,8 +18,8 @@ SYMBOL: live-values
 : look-at-inputs ( node -- ) in-d>> look-at-values ;
 
 : init-dead-code ( -- )
-    <hashed-dlist> work-list set
-    H{ { +bottom+ f } } clone live-values set ;
+    <hashed-dlist> work-list namespaces:set
+    H{ { +bottom+ f } } clone live-values namespaces:set ;
 
 GENERIC: mark-live-values* ( node -- )
 

diff --git a/basis/compiler/tree/def-use/simplified/simplified.factor b/basis/compiler/tree/def-use/simplified/simplified.factor
index a92f13ab7beeafc1dfb53b73d2fba3816ed032b3..2fc4f08acd8f17df1b489b0c43c5cb96c44fc205 100644 (file)
--- a/basis/compiler/tree/def-use/simplified/simplified.factor
+++ b/basis/compiler/tree/def-use/simplified/simplified.factor
@@ -18,8 +18,8 @@ SYMBOLS: visited accum ;
 
 : with-simplified-def-use ( quot -- real-usages )
     [
-        HS{ } clone visited set
-        HS{ } clone accum set
+        HS{ } clone visited namespaces:set
+        HS{ } clone accum namespaces:set
         call
         accum get members
     ] with-scope ; inline

diff --git a/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor b/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
index fafea21e69c80bfbb01dc125313ea2f91a153417..4c0f69df2b366980bec35bae5add4eb786f348ef 100644 (file)
--- a/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
+++ b/basis/compiler/tree/modular-arithmetic/modular-arithmetic.factor
@@ -98,8 +98,8 @@ M: node compute-modular-candidates*
     drop ;
 
 : compute-modular-candidates ( nodes -- )
-    HS{ } clone modular-values set
-    HS{ } clone fixnum-values set
+    HS{ } clone modular-values namespaces:set
+    HS{ } clone fixnum-values namespaces:set
     [ compute-modular-candidates* ] each-node ;
 
 GENERIC: only-reads-low-order? ( node -- ? )

diff --git a/basis/compiler/tree/recursive/recursive.factor b/basis/compiler/tree/recursive/recursive.factor
index 86c11a36e72d263763ba21e12bee3b34a9ae4282..f819f1d0e467434bf2c6e54b2bf9c2d6f4032e22 100644 (file)
--- a/basis/compiler/tree/recursive/recursive.factor
+++ b/basis/compiler/tree/recursive/recursive.factor
@@ -35,8 +35,8 @@ GENERIC: node-call-graph ( tail? node -- )
 
 : build-call-graph ( nodes -- labels calls )
     [
-        V{ } clone children set
-        V{ } clone calls set
+        V{ } clone children namespaces:set
+        V{ } clone calls namespaces:set
         [ t ] dip (build-call-graph)
         children get
         calls get
@@ -111,8 +111,8 @@ SYMBOL: changed?
     [ changed? get [ while-changing ] [ drop ] if ] bi ; inline recursive
 
 : detect-loops ( call-graph -- )
-    HS{ } clone not-loops set
-    V{ } clone recursive-nesting set
+    HS{ } clone not-loops namespaces:set
+    V{ } clone recursive-nesting namespaces:set
     [ visit-back-edges ]
     [ '[ _ detect-cross-frame-calls ] while-changing ]
     bi ;
@@ -130,7 +130,7 @@ SYMBOL: call-graph
 
 : analyze-recursive ( nodes -- nodes )
     dup build-call-graph drop
-    [ call-graph set ]
+    [ call-graph namespaces:set ]
     [ detect-loops ]
     [ mark-loops ]
     tri ;

diff --git a/basis/furnace/auth/auth.factor b/basis/furnace/auth/auth.factor
index b75c53eb8b688c44c68e7b1d0c9391b543e943de..173984db3239aa03dee2eb3ebede6e8a812a4136 100644 (file)
--- a/basis/furnace/auth/auth.factor
+++ b/basis/furnace/auth/auth.factor
@@ -93,12 +93,12 @@ M: user-saver dispose
     <user-saver> &dispose drop ;
 
 : init-user ( user -- )
-    [ [ logged-in-user set ] [ save-user-after ] bi ] when* ;
+    [ [ logged-in-user namespaces:set ] [ save-user-after ] bi ] when* ;
 
 \ init-user DEBUG add-input-logging
 
 M: realm call-responder* ( path responder -- response )
-    dup realm set
+    dup realm namespaces:set
     logged-in? [
         dup init-realm
         dup logged-in-username
@@ -147,7 +147,7 @@ TUPLE: protected < filter-responder description capabilities ;
     ] if ;
 
 M: protected call-responder* ( path responder -- response )
-    dup protected set
+    dup protected namespaces:set
     dup capabilities>> have-capabilities?
     [ call-next-method ] [
         [ drop ] [ [ description>> ] [ capabilities>> ] bi ] bi*

diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index 1b3324b53c3afc11ba044599c12d8628ba2b8aeb..b8638a65de42eed75db00fffce2e8504f64f5855 100644 (file)
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -29,11 +29,11 @@ SYMBOL: blank-line
     and [ nl ] when ;
 
 : ($blank-line) ( -- )
-    nl nl blank-line last-element set ;
+    nl nl blank-line last-element namespaces:set ;
 
 : ($span) ( quot -- )
     last-block? [ nl ] when
-    span last-element set
+    span last-element namespaces:set
     call ; inline
 
 GENERIC: print-element ( element -- )
@@ -58,9 +58,9 @@ M: f print-element drop ;
 
 : ($block) ( quot -- )
     ?nl
-    span last-element set
+    span last-element namespaces:set
     call
-    block last-element set ; inline
+    block last-element namespaces:set ; inline
 
 ! Some spans
 
@@ -84,7 +84,7 @@ ALIAS: $slot $snippet
 
 : $nl ( children -- )
     drop nl last-element get [ nl ] when
-    blank-line last-element set ;
+    blank-line last-element namespaces:set ;
 
 ! Some blocks
 : ($heading) ( children quot -- )

diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor
index 9a0704d453a9ded93fb869764c9baba1ee402da9..cf96a6e0efca218ce4d54f6dd9d724c02063c9e0 100644 (file)
--- a/basis/html/templates/chloe/compiler/compiler.factor
+++ b/basis/html/templates/chloe/compiler/compiler.factor
@@ -140,8 +140,8 @@ ERROR: unknown-chloe-tag tag ;
 
 : with-compiler ( quot -- quot' )
     [
-        SBUF" " string-buffer set
-        V{ } clone tag-stack set
+        SBUF" " string-buffer namespaces:set
+        V{ } clone tag-stack namespaces:set
         call
         reset-buffer
     ] [ ] make ; inline
@@ -152,7 +152,7 @@ ERROR: unknown-chloe-tag tag ;
 : compile-quot ( quot -- )
     reset-buffer
     [
-        SBUF" " string-buffer set
+        SBUF" " string-buffer namespaces:set
         call
         reset-buffer
     ] [ ] make , ; inline

diff --git a/basis/inspector/inspector.factor b/basis/inspector/inspector.factor
index eaeed3cf51710dcf27f90ad3b88b79dbd15cf854..70733b1aeae12855427bbadfd4e7a64133d378f9 100644 (file)
--- a/basis/inspector/inspector.factor
+++ b/basis/inspector/inspector.factor
@@ -69,11 +69,11 @@ SYMBOL: inspector-stack
 SYMBOL: sorted-keys
 
 : reinspect ( obj -- )
-    [ me set ]
+    [ me namespaces:set ]
     [
-        dup make-mirror dup mirror set
+        dup make-mirror dup mirror namespaces:set
         t +number-rows+ [ (describe) ] with-variable
-        sorted-keys set
+        sorted-keys namespaces:set
     ] bi ;
 
 : (inspect) ( obj -- )
@@ -118,7 +118,7 @@ PRIVATE>
 
 : inspector ( obj -- )
     &help
-    V{ } clone inspector-stack set
+    V{ } clone inspector-stack namespaces:set
     (inspect) ;
 
 : inspect ( obj -- )

diff --git a/basis/io/servers/servers.factor b/basis/io/servers/servers.factor
index af1923ddde7fcde6ec62ba8e2c45e5347221e201..7cbb69097efe9be02a877c3e7b41c4581b5f8e28 100755 (executable)
--- a/basis/io/servers/servers.factor
+++ b/basis/io/servers/servers.factor
@@ -101,7 +101,7 @@ M: f >insecure ;
 
 : log-connection ( remote local -- )
     [ accepted-connection ]
-    [ [ remote-address set ] [ local-address set ] bi* ]
+    [ [ remote-address namespaces:set ] [ local-address namespaces:set ] bi* ]
     2bi ;
 
 M: threaded-server handle-client* handler>> call( -- ) ;

diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index 3e593930a30a75536cb7f25d1ab7ce06010c8292..ad386dbbe85ee49f9918065aad880f0d447f5be3 100644 (file)
--- a/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@ -112,9 +112,9 @@ TUPLE: peg-head rule-id involved-set eval-set ;
 
 : process-rule-result ( p result -- result )
     [
-        nip [ ast>> ] [ remaining>> ] bi input-from pos set
+        nip [ ast>> ] [ remaining>> ] bi input-from pos namespaces:set
     ] [
-        pos set fail
+        pos namespaces:set fail
     ] if* ;
 
 : eval-rule ( rule -- ast )
@@ -139,7 +139,7 @@ TUPLE: peg-head rule-id involved-set eval-set ;
     pos>> <= or ;
 
 : setup-growth ( h p -- )
-    pos set dup involved-set>> clone >>eval-set drop ;
+    pos namespaces:set dup involved-set>> clone >>eval-set drop ;
 
 : (grow-lr) ( h p r: ( -- result ) m -- )
     [ [ setup-growth ] 2keep ] 2dip
@@ -155,7 +155,7 @@ TUPLE: peg-head rule-id involved-set eval-set ;
     [ [ heads set-at ] 2keep ] 2dip
     pick over [ (grow-lr) ] 2dip
     swap heads delete-at
-    dup pos>> pos set ans>>
+    dup pos>> pos namespaces:set ans>>
     ; inline
 
 :: (setup-lr) ( l s -- )
@@ -209,9 +209,9 @@ TUPLE: peg-head rule-id involved-set eval-set ;
 
 :: apply-non-memo-rule ( r p -- ast )
     fail r rule-id f lrstack get left-recursion boa :> lr
-    lr lrstack set lr p memo-entry boa dup p r rule-id set-memo :> m
+    lr lrstack namespaces:set lr p memo-entry boa dup p r rule-id set-memo :> m
     r eval-rule :> ans
-    lrstack get next>> lrstack set
+    lrstack get next>> lrstack namespaces:set
     pos get m pos<<
     lr head>> [
         m ans>> left-recursion? [
@@ -224,7 +224,7 @@ TUPLE: peg-head rule-id involved-set eval-set ;
     ] if ; inline
 
 : apply-memo-rule ( r m -- ast )
-    [ ans>> ] [ pos>> ] bi pos set
+    [ ans>> ] [ pos>> ] bi pos namespaces:set
     dup left-recursion? [
         [ setup-lr ] keep seed>>
     ] [
@@ -497,7 +497,7 @@ TUPLE: sp-parser parser ;
 
 M: sp-parser (compile)
     parser>> compile-parser-quot '[
-        input-slice [ blank? ] trim-head-slice input-from pos set @
+        input-slice [ blank? ] trim-head-slice input-from pos namespaces:set @
     ] ;
 
 TUPLE: delay-parser quot ;

diff --git a/basis/prettyprint/sections/sections.factor b/basis/prettyprint/sections/sections.factor
index 581d6757f8b8a0ec473bfec5118c5f76a213b276..8a37a6b72079869110a6a01326a2b3cea8cfb193 100644 (file)
--- a/basis/prettyprint/sections/sections.factor
+++ b/basis/prettyprint/sections/sections.factor
@@ -326,8 +326,8 @@ SYMBOL: next
 : group-flow ( seq -- newseq )
     [
         dup length iota [
-            2dup 1 - swap ?nth prev set
-            2dup 1 + swap ?nth next set
+            2dup 1 - swap ?nth prev namespaces:set
+            2dup 1 + swap ?nth next namespaces:set
             swap nth dup split-before dup , split-after
         ] with each
     ] { } make { t } split harvest ;
@@ -358,10 +358,10 @@ M: block long-section ( block -- )
 
 : make-pprint ( obj quot manifest? -- block manifest/f )
     [
-        0 position set
-        HS{ } clone pprinter-use set
-        V{ } clone recursion-check set
-        V{ } clone pprinter-stack set
+        0 position namespaces:set
+        HS{ } clone pprinter-use namespaces:set
+        V{ } clone recursion-check namespaces:set
+        V{ } clone pprinter-stack namespaces:set
 
         [ over <object call pprinter-block ] dip
         [ pprinter-manifest ] [ f ] if

diff --git a/basis/regexp/nfa/nfa.factor b/basis/regexp/nfa/nfa.factor
index 8203bc122c165b4f0c5da8e9fc681002fe1544ad..864a1fedba3b3b5e38509110222ca64f9915b41e 100644 (file)
--- a/basis/regexp/nfa/nfa.factor
+++ b/basis/regexp/nfa/nfa.factor
@@ -158,8 +158,8 @@ M: with-options nfa-node ( node -- start end )
 
 : construct-nfa ( ast -- nfa-table )
     [
-        0 state set
-        <transition-table> nfa-table set
+        0 state namespaces:set
+        <transition-table> nfa-table namespaces:set
         nfa-node
         nfa-table get
             swap 1array fast-set >>final-states

diff --git a/basis/see/see.factor b/basis/see/see.factor
index 1b006b1ff26760d1be2fc3c96e303e59f0d4eede..a88b85843286343270815450fa8edf89748ca88e 100644 (file)
--- a/basis/see/see.factor
+++ b/basis/see/see.factor
@@ -20,8 +20,8 @@ GENERIC: see* ( defspec -- )
 : synopsis ( defspec -- str )
     [
         string-limit? off
-        0 margin set
-        1 line-limit set
+        0 margin namespaces:set
+        1 line-limit namespaces:set
         [ synopsis* ] with-in
     ] with-string-writer ;
 
@@ -46,7 +46,7 @@ M: word print-stack-effect? drop t ;
 <PRIVATE
 
 : seeing-word ( word -- )
-    vocabulary>> dup [ lookup-vocab ] when pprinter-in set ;
+    vocabulary>> dup [ lookup-vocab ] when pprinter-in namespaces:set ;
 
 : word-synopsis ( word -- )
     {
@@ -92,7 +92,8 @@ M: pathname synopsis* pprint* ;
 
 M: alias summary
     [
-        0 margin set 1 line-limit set
+        0 margin namespaces:set
+        1 line-limit namespaces:set
         [
             {
                 [ seeing-word ]
@@ -127,8 +128,8 @@ M: word declarations.
 
 M: object see*
     [
-        12 nesting-limit set
-        100 length-limit set
+        12 nesting-limit namespaces:set
+        100 length-limit namespaces:set
         <colon dup synopsis*
         <block dup definition pprint-elements block>
         dup definer nip [ pprint-word ] when* declarations.

diff --git a/basis/stack-checker/dependencies/dependencies.factor b/basis/stack-checker/dependencies/dependencies.factor
index 5fa70e3f8068aa8b887f24f625f0897eee7abc93..083765088d4e90d6dcf35fcfeec4a58cc935b77a 100644 (file)
--- a/basis/stack-checker/dependencies/dependencies.factor
+++ b/basis/stack-checker/dependencies/dependencies.factor
@@ -147,9 +147,9 @@ M: depends-on-final satisfied?
     class>> { [ class? ] [ final-class? ] } 1&& ;
 
 : init-dependencies ( -- )
-    H{ } clone dependencies set
-    H{ } clone generic-dependencies set
-    HS{ } clone conditional-dependencies set ;
+    H{ } clone dependencies namespaces:set
+    H{ } clone generic-dependencies namespaces:set
+    HS{ } clone conditional-dependencies namespaces:set ;
 
 : without-dependencies ( quot -- )
     [

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 6fa44bbec5a48855c5e9c5f3516682a91eab4f3e..7610311c90f4b154575f70a1bbb6e9875d88029c 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -619,7 +619,7 @@ SYMBOL: deploy-vocab
                     "ui.debugger" require
                 ] when
             ] unless
-            [ deploy-vocab set ] [ require ] [
+            [ deploy-vocab namespaces:set ] [ require ] [
                 vocab-main [
                     "Vocabulary has no MAIN: word." print flush 1 exit
                 ] unless

diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor
index f92f8de63c6c3cb78edba29c54343b6690632754..dfe6cf9c970ea0c7d2801de68857d94d1a132e79 100644 (file)
--- a/basis/ui/gestures/gestures.factor
+++ b/basis/ui/gestures/gestures.factor
@@ -269,10 +269,10 @@ SYMBOL: drag-timer
         dup multi-click? [
             hand-click# inc
         ] [
-            1 hand-click# set
+            1 hand-click# namespaces:set
         ] if
-        hand-last-button set
-        nano-count hand-last-time set
+        hand-last-button namespaces:set
+        nano-count hand-last-time namespaces:set
     ] with-global ;
 
 : update-clicked ( -- )

diff --git a/basis/ui/render/render.factor b/basis/ui/render/render.factor
index 0fb9e6cc1be8a70c00658a9c567248720c8ae8f7..60269bc625022609522575491dd8c271e64252f1 100644 (file)
--- a/basis/ui/render/render.factor
+++ b/basis/ui/render/render.factor
@@ -20,11 +20,11 @@ SYMBOL: viewport-translation
 : init-clip ( gadget -- )
     [
         dim>>
-        [ { 0 1 } v* viewport-translation set ]
+        [ { 0 1 } v* viewport-translation namespaces:set ]
         [ [ { 0 0 } ] dip gl-viewport ]
         [ [ 0 ] dip first2 0 1 -1 glOrtho ] tri
     ]
-    [ clip set ] bi
+    [ clip namespaces:set ] bi
     do-clip ;
 
 SLOT: background-color
@@ -87,7 +87,7 @@ M: gadget gadget-foreground dup interior>> pen-foreground ;
 <PRIVATE
 
 : draw-selection-background ( gadget -- )
-    selection-background get background set
+    selection-background get background namespaces:set
     selection-background get gl-color
     [ { 0 0 } ] dip dim>> gl-fill-rect ;
 
@@ -122,7 +122,8 @@ PRIVATE>
     >absolute clip [ rect-intersect ] change ;
 
 : with-clipping ( gadget quot -- )
-    clip get [ over change-clip do-clip call ] dip clip set do-clip ; inline
+    clip get [ over change-clip do-clip call ] dip
+    clip namespaces:set do-clip ; inline
 
 : draw-gadget ( gadget -- )
     {
@@ -141,10 +142,10 @@ M: gadget draw-children
         } cleave [
 
             {
-                [ [ selected-gadgets set ] when* ]
-                [ [ selection-background set ] when* ]
-                [ [ background set ] when* ]
-                [ [ foreground set ] when* ]
+                [ [ selected-gadgets namespaces:set ] when* ]
+                [ [ selection-background namespaces:set ] when* ]
+                [ [ background namespaces:set ] when* ]
+                [ [ foreground namespaces:set ] when* ]
             } spread
             [ draw-gadget ] each
         ] with-scope

diff --git a/basis/xml/elements/elements.factor b/basis/xml/elements/elements.factor
index 8fcc19c540308bc3da4f54742b990ad200a94dd9..bdd33ed5913c5e5208a832814b7387bd786512c6 100644 (file)
--- a/basis/xml/elements/elements.factor
+++ b/basis/xml/elements/elements.factor
@@ -121,8 +121,8 @@ DEFER: make-tag ! Is this unavoidable?
 
 : take-internal-subset ( -- dtd )
     [
-        H{ } clone pe-table set
-        t in-dtd? set
+        H{ } clone pe-table namespaces:set
+        t in-dtd? namespaces:set
         dtd-loop
         pe-table get
     ] { } make swap extra-entities get swap <dtd> ;

diff --git a/basis/xml/xml.factor b/basis/xml/xml.factor
index 8e75c5ec7e0c590378ffd4aabb3cfcd6f0658043..b0713eb1531aed7b8b0c3babf3ed947a6f5d410f 100644 (file)
--- a/basis/xml/xml.factor
+++ b/basis/xml/xml.factor
@@ -54,7 +54,7 @@ M: closer process
     <tag> add-child ;
 
 : init-xml-stack ( -- )
-    V{ } clone xml-stack set
+    V{ } clone xml-stack namespaces:set
     f push-xml ;
 
 : default-prolog ( -- prolog )
@@ -125,7 +125,7 @@ TUPLE: pull-xml scope ;
     scope>> [
         text-now? get [ parse-text f ] [
             get-char [ make-tag t ] [ f f ] if
-        ] if text-now? set
+        ] if text-now? namespaces:set
     ] with-variables ;
 
 <PRIVATE
@@ -157,7 +157,7 @@ PRIVATE>
 
 : read-seq ( stream quot n -- seq )
     rot [
-        depth set
+        depth namespaces:set
         init-xml init-xml-stack
         call
         [ process ] xml-loop
@@ -200,7 +200,7 @@ PRIVATE>
 
 : read-dtd ( stream -- dtd )
     [
-        H{ } clone extra-entities set
+        H{ } clone extra-entities namespaces:set
         take-internal-subset
     ] with-state ;
 

diff --git a/core/classes/classes.factor b/core/classes/classes.factor
index cd07c4a65b213d50edf554e8c88310ef8f86c76b..c2b1a44f367dff507ad7a0d93846e57f0fef03a8 100644 (file)
--- a/core/classes/classes.factor
+++ b/core/classes/classes.factor
@@ -24,12 +24,12 @@ SYMBOL: class-or-cache
 SYMBOL: next-method-quot-cache
 
 : init-caches ( -- )
-    H{ } clone class<=-cache set
-    H{ } clone class-not-cache set
-    H{ } clone classes-intersect-cache set
-    H{ } clone class-and-cache set
-    H{ } clone class-or-cache set
-    H{ } clone next-method-quot-cache set ;
+    H{ } clone class<=-cache namespaces:set
+    H{ } clone class-not-cache namespaces:set
+    H{ } clone classes-intersect-cache namespaces:set
+    H{ } clone class-and-cache namespaces:set
+    H{ } clone class-or-cache namespaces:set
+    H{ } clone next-method-quot-cache namespaces:set ;
 
 : reset-caches ( -- )
     class<=-cache get clear-assoc

diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor
index ec3d392e0a64128eb6efcc2a070f92187f1f3e19..b90306a9cb46a5b2ec24f3b97036f9be7726df52 100644 (file)
--- a/core/compiler/units/units.factor
+++ b/core/compiler/units/units.factor
@@ -177,7 +177,7 @@ M: nesting-observer definitions-changed
 
 : add-nesting-observer ( -- )
     new-words get nesting-observer boa
-    [ nesting-observer set ] [ add-definition-observer ] bi ;
+    [ nesting-observer namespaces:set ] [ add-definition-observer ] bi ;
 
 : remove-nesting-observer ( -- )
     nesting-observer get remove-definition-observer ;

diff --git a/core/sets/sets.factor b/core/sets/sets.factor
index 2614a5287c9df99fa2a8d1bde7801c41c670dc45..0417930e3cb6d6962767e7332ae5a81c1b722311 100644 (file)
--- a/core/sets/sets.factor
+++ b/core/sets/sets.factor
@@ -3,6 +3,7 @@
 USING: assocs hashtables kernel math sequences vectors ;
 IN: sets
 
+! Set protocol
 MIXIN: set
 
 GENERIC: adjoin ( elt set -- )

diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor
index cfb5a9e5e538740af1f920a2a9c5ecfe4130e84d..06a415f136651eec8ca7e46810c719f3d4e63cc0 100644 (file)
--- a/core/source-files/source-files.factor
+++ b/core/source-files/source-files.factor
@@ -71,8 +71,8 @@ SYMBOL: current-source-file
     H{ } clone [
         [
             path>source-file
-            [ current-source-file set ]
-            [ definitions>> old-definitions set ] bi
+            [ current-source-file namespaces:set ]
+            [ definitions>> old-definitions namespaces:set ] bi
         ] dip
         [ wrap-source-file-error ] recover
     ] with-variables ; inline

diff --git a/extra/koszul/koszul.factor b/extra/koszul/koszul.factor
index d5762a01cff3eab007468379d27d051899a529a7..e61286c10e2559f96c5c6db3a29dfc220b0c673f 100644 (file)
--- a/extra/koszul/koszul.factor
+++ b/extra/koszul/koszul.factor
@@ -25,7 +25,7 @@ SYMBOL: terms
 
 : with-terms ( quot -- hash )
     [
-        H{ } clone terms set call terms get canonicalize
+        H{ } clone terms namespaces:set call terms get canonicalize
     ] with-scope ; inline
 
 ! Printing elements

diff --git a/extra/managed-server/managed-server.factor b/extra/managed-server/managed-server.factor
index b7a73c48320deaac87d6e2bfd60695c8728f0c88..a7414052abe86146d59fa4ab619cce92abdc5627 100644 (file)
--- a/extra/managed-server/managed-server.factor
+++ b/extra/managed-server/managed-server.factor
@@ -77,7 +77,7 @@ PRIVATE>
     [ username server clients>> delete-at ] when-logged-in ;
 
 : handle-managed-client ( -- )
-    handle-login <managed-client> managed-client set
+    handle-login <managed-client> managed-client namespaces:set
     maybe-login-client [
         handle-client-join
         [ handle-managed-client* client quit?>> not ] loop
@@ -92,7 +92,7 @@ PRIVATE>
 PRIVATE>
 
 M: managed-server handle-client*
-    managed-server set
+    managed-server namespaces:set
     [ handle-managed-client ]
     [ cleanup-client ]
     [ ] cleanup ;

diff --git a/extra/project-euler/051/051.factor b/extra/project-euler/051/051.factor
index cebd4d67f930360c8cff3e593a11e695c82bf162..40d53109cb9f096e349e17dbe738fa1919011742 100644 (file)
--- a/extra/project-euler/051/051.factor
+++ b/extra/project-euler/051/051.factor
@@ -34,8 +34,8 @@ IN: project-euler.051
 SYMBOL: family-count
 SYMBOL: large-families
 : reset-globals ( -- )
-    H{ } clone family-count set
-    H{ } clone large-families set ;
+    H{ } clone family-count namespaces:set
+    H{ } clone large-families namespaces:set ;
 
 : digits-positions ( str -- positions )
     H{ } clone [ '[ swap _ push-at ] each-index ] keep ;