prettyprint.stylesheet: use assoc-union! and set-at when possible.

diff --git a/basis/prettyprint/stylesheet/stylesheet.factor b/basis/prettyprint/stylesheet/stylesheet.factor
index 4056a27e9ac4966cfa985a2b3a42b4d65704c01b..f19c34db2aaf89f1ce6779b40f97a854c415e3ff 100644 (file)
--- a/basis/prettyprint/stylesheet/stylesheet.factor
+++ b/basis/prettyprint/stylesheet/stylesheet.factor
@@ -23,16 +23,19 @@ GENERIC: word-style ( word -- style )
 
 M: word word-style
     [ presented associate ]
-    [ "word-style" word-prop >hashtable ] bi assoc-union ;
+    [ "word-style" word-prop ] bi assoc-union! ;
 
 M: highlighted-word word-style
-    call-next-method COLOR: DarkSlateGray foreground associate
-    swap assoc-union ;
+    call-next-method
+    COLOR: DarkSlateGray foreground pick set-at ;
 
 <PRIVATE
 
 : colored-presentation-style ( obj color -- style )
-    [ presented associate ] [ foreground associate ] bi* assoc-union ;
+    H{ } clone [
+        [ presented foreground ] dip
+        [ set-at ] curry bi-curry@ bi*
+    ] keep ;
 
 PRIVATE>