Move conjoin-at from compiler.cfg.liveness to sets

diff --git a/basis/compiler/cfg/liveness/liveness.factor b/basis/compiler/cfg/liveness/liveness.factor
index 8a46b32070a1280b50f256a225dbe289d6001e0a..9dc320660cca26c08187758c390a56826a24efb9 100644 (file)
--- a/basis/compiler/cfg/liveness/liveness.factor
+++ b/basis/compiler/cfg/liveness/liveness.factor
@@ -43,9 +43,6 @@ SYMBOL: work-list
     [ nip kill-set ]
     2bi assoc-diff ;
 
-: conjoin-at ( value key assoc -- )
-    [ dupd ?set-at ] change-at ;
-
 : compute-phi-live-in ( basic-block -- phi-live-in )
     instructions>> [ ##phi? ] filter [ f ] [
         H{ } clone [

diff --git a/core/sets/sets-docs.factor b/core/sets/sets-docs.factor
index 0fce78dd681877e17ec9c01b9758f009f5ad40d2..cec3d65d3c13502e8382444193372550ece4277a 100755 (executable)
--- a/core/sets/sets-docs.factor
+++ b/core/sets/sets-docs.factor
@@ -23,6 +23,7 @@ $nl
 "Adding elements to sets:"
 { $subsection adjoin }
 { $subsection conjoin }
+{ $subsection conjoin-at }
 { $see-also member? memq? any? all? "assocs-sets" } ;
 
 ABOUT: "sets"
@@ -54,6 +55,10 @@ HELP: conjoin
 }
 { $side-effects "assoc" } ;
 
+HELP: conjoin-at
+{ $values { "value" object } { "key" object } { "assoc" assoc } }
+{ $description "Adds " { $snippet "value" } " to the set stored at " { $snippet "key" } " of " { $snippet "assoc" } "." } ;
+
 HELP: unique
 { $values { "seq" "a sequence" } { "assoc" assoc } }
 { $description "Outputs a new assoc where the keys and values are equal." }

diff --git a/core/sets/sets.factor b/core/sets/sets.factor
index 062b624e8fec0f327b45b06b045893a7dbd8d20d..c7b834297adab9ebce2bf0e973bfea68fc4dc29d 100755 (executable)
--- a/core/sets/sets.factor
+++ b/core/sets/sets.factor
@@ -7,6 +7,9 @@ IN: sets
 
 : conjoin ( elt assoc -- ) dupd set-at ;
 
+: conjoin-at ( value key assoc -- )
+    [ dupd ?set-at ] change-at ;
+
 : (prune) ( elt hash vec -- )
     3dup drop key? [ 3drop ] [
         [ drop conjoin ] [ nip push ] 3bi