Update some more 'update' usages to call 'assoc-union!'

diff --git a/basis/furnace/actions/actions.factor b/basis/furnace/actions/actions.factor
index aca03b9029258b7a4109a408e4c8c2fa15aca5c1..19491acfc3f00aad2ca8feedf0c5ec76279adda1 100644 (file)
--- a/basis/furnace/actions/actions.factor
+++ b/basis/furnace/actions/actions.factor
@@ -28,10 +28,10 @@ TUPLE: action rest init authorize display validate submit ;
     action new-action ;\r
 \r
 : merge-forms ( form -- )\r
-    form get\r
-    [ [ errors>> ] bi@ push-all ]\r
-    [ [ values>> ] bi@ swap update ]\r
-    [ swap validation-failed>> >>validation-failed drop ]\r
+    [ form get ] dip\r
+    [ [ errors>> ] bi@ append! drop ]\r
+    [ [ values>> ] bi@ assoc-union! drop ]\r
+    [ validation-failed>> >>validation-failed drop ]\r
     2tri ;\r
 \r
 : set-nested-form ( form name -- )\r

diff --git a/basis/furnace/chloe-tags/chloe-tags.factor b/basis/furnace/chloe-tags/chloe-tags.factor
index 562fe5a61466c6acbda969723c57145b1a72214c..8a08063595692136dace4aaf9c4f4423fc5b6bf4 100644 (file)
--- a/basis/furnace/chloe-tags/chloe-tags.factor
+++ b/basis/furnace/chloe-tags/chloe-tags.factor
@@ -136,7 +136,7 @@ CHLOE: form
     XML> body>> clone ;
 
 : add-tag-attrs ( attrs tag -- )
-    attrs>> swap update ;
+    attrs>> swap assoc-union! drop ;
 
 CHLOE: button
     button-tag-markup

diff --git a/basis/html/forms/forms.factor b/basis/html/forms/forms.factor
index 5cf318bcafd0c7b003b9377e78d42124e28e8bd9..cf959ba058d3a614d779e89965e669bb42113831 100644 (file)
--- a/basis/html/forms/forms.factor
+++ b/basis/html/forms/forms.factor
@@ -35,10 +35,10 @@ M: form clone
     [ [ value ] keep ] dip ; inline
 
 : from-object ( object -- )
-    [ values ] [ make-mirror ] bi* update ;
+    [ values ] [ make-mirror ] bi* assoc-union! drop ;
 
 : to-object ( destination names -- )
-    [ make-mirror ] [ values extract-keys ] bi* update ;
+    [ make-mirror ] [ values extract-keys ] bi* assoc-union! drop ;
 
 : with-each-value ( name quot -- )
     [ value ] dip '[

diff --git a/basis/regexp/negation/negation.factor b/basis/regexp/negation/negation.factor
index 8b0a2f6edf0348e30c93c7493290c2c1efc972ae..802e2115368d07b0502b230e285a51bfba6a61e4 100644 (file)
--- a/basis/regexp/negation/negation.factor
+++ b/basis/regexp/negation/negation.factor
@@ -44,7 +44,7 @@ CONSTANT: fail-state -1
     unify-final-state renumber-states box-transitions 
     [ start-state>> ]
     [ final-states>> keys first ]
-    [ nfa-table get [ transitions>> ] bi@ swap update ] tri ;
+    [ nfa-table get [ transitions>> ] bi@ swap assoc-union! drop ] tri ;
 
 : ast>dfa ( parse-tree -- minimal-dfa )
     construct-nfa disambiguate construct-dfa minimize ;

diff --git a/basis/serialize/serialize.factor b/basis/serialize/serialize.factor
index 0840c778d7923473d6a3c434b8c7aed0cded8ad7..10d68fee590d4939f42fe85610e5b8f8d0e7ee11 100644 (file)
--- a/basis/serialize/serialize.factor
+++ b/basis/serialize/serialize.factor
@@ -236,7 +236,7 @@ SYMBOL: deserialized
 : deserialize-hashtable ( -- hashtable )
     H{ } clone
     [ intern-object ]
-    [ (deserialize) update ]
+    [ (deserialize) assoc-union! drop ]
     [ ] tri ;
 
 : copy-seq-to-tuple ( seq tuple -- )

diff --git a/basis/xmode/catalog/catalog.factor b/basis/xmode/catalog/catalog.factor
index 40b8e2191c1173a329ff4d9cd9e011b5f4e2dc1a..5d0f7f0ea487e7aa1ea1c760fedcb3df207ca6df 100644 (file)
--- a/basis/xmode/catalog/catalog.factor
+++ b/basis/xmode/catalog/catalog.factor
@@ -67,7 +67,7 @@ DEFER: finalize-rule-set
     [ resolve-delegate ] each-rule ;
 
 : ?update ( keyword-map/f keyword-map -- keyword-map )
-    over [ dupd update ] [ nip clone ] if ;
+    over [ assoc-union! ] [ nip clone ] if ;
 
 : import-keywords ( parent child -- )
     over [ [ keywords>> ] bi@ ?update ] dip (>>keywords) ;

diff --git a/basis/xmode/keyword-map/keyword-map-tests.factor b/basis/xmode/keyword-map/keyword-map-tests.factor
index b14bbd0f709cae812223a7046f679050823c214f..0e5c03fb571163f2b5dfccb811ca79cf2e30140f 100644 (file)
--- a/basis/xmode/keyword-map/keyword-map-tests.factor
+++ b/basis/xmode/keyword-map/keyword-map-tests.factor
@@ -8,7 +8,7 @@ f <keyword-map> dup "k" set
     { "int" KEYWORD1 }
     { "void" KEYWORD2 }
     { "size_t" KEYWORD3 }
-} update
+} assoc-union! drop
 
 [ 3 ] [ "k" get assoc-size ] unit-test
 [ KEYWORD1 ] [ "int" "k" get at ] unit-test
@@ -21,7 +21,7 @@ t <keyword-map> dup "k" set
     { "Foo" KEYWORD1 }
     { "bbar" KEYWORD2 }
     { "BAZ" KEYWORD3 }
-} update
+} assoc-union! drop
 
 [ KEYWORD1 ] [ "fOo" "k" get at ] unit-test
 

diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor
index 6a14280e6e8b7915864562d409af1d757d06a010..9c25c2cb577ff9f2acc9d09affa5d4b00576cd9f 100644 (file)
--- a/extra/id3/id3.factor
+++ b/extra/id3/id3.factor
@@ -153,7 +153,7 @@ CONSTANT: id3v1+-length 227
     } cleave ;
 
 : merge-frames ( id3 assoc -- id3 )
-    [ dup frames>> ] dip update ;
+    [ dup frames>> ] dip assoc-union! drop ;
 
 : merge-id3v1 ( id3 -- id3 )
     dup id3v1>frames frames>assoc merge-frames ;

diff --git a/extra/multi-methods/multi-methods.factor b/extra/multi-methods/multi-methods.factor
index 6bed6d5f32ee18f7dae771236ce64cd31b342770..caf37dbadbf7cc1e55ee413ad02e86e86b3b3765 100644 (file)
--- a/extra/multi-methods/multi-methods.factor
+++ b/extra/multi-methods/multi-methods.factor
@@ -40,7 +40,7 @@ SYMBOL: total
     ] assoc-map ;
 
 : canonicalize-specializer-3 ( specializer -- specializer' )
-    [ total get object <array> dup <enum> ] dip update ;
+    [ total get object <array> <enum> ] dip assoc-union! seq>> ;
 
 : canonicalize-specializers ( methods -- methods' hooks )
     [