tools.scaffold: more use of hash-sets.

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 2b3461eb69ae04aa6fd500e8d08022498cacca93..7009636107aa5491951ff7bce8a25c8152f4125a 100644 (file)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -142,7 +142,7 @@ ERROR: vocab-name-contains-dot path ;
     } at* ;
 
 : add-using ( object -- )
-    vocabulary>> using get [ conjoin ] [ drop ] if* ;
+    vocabulary>> using get [ adjoin ] [ drop ] if* ;
 
 : ($values.) ( array -- )
     [ bl ] [
@@ -224,7 +224,7 @@ ERROR: vocab-name-contains-dot path ;
 
 : write-using ( vocab -- )
     "USING:" write
-    using get keys
+    using get members
     { "help.markup" "help.syntax" } append natural-sort remove
     [ bl write ] each
     " ;" print ;
@@ -237,7 +237,7 @@ ERROR: vocab-name-contains-dot path ;
     ] with-output-stream ;
 
 : with-scaffold ( quot -- )
-    [ H{ } clone using ] dip with-variable ; inline
+    [ HS{ } clone using ] dip with-variable ; inline
 
 : link-vocab ( vocab -- )
     check-vocab