use reject instead of [ ... not ] filter.

[factor.git] / basis / tools / scaffold / scaffold.factor

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 3f1a983e1485924f8589aa87f7190eea97758b4b..7cf5b1471715e77026ee4e6d52473fc30c7b3bb6 100644 (file)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -146,7 +146,13 @@ ERROR: vocab-name-contains-dot path ;
         { "url" url }
     } at* [ swap [ \ $maybe swap 2array ] when ] dip ;
 
-: add-using ( object -- )
+GENERIC: add-using ( object -- )
+
+M: array add-using [ add-using ] each ;
+
+M: string add-using drop ;
+
+M: object add-using ( object -- )
     vocabulary>> using get [ adjoin ] [ drop ] if* ;
 
 : 4bl ( -- )
@@ -160,7 +166,7 @@ ERROR: vocab-name-contains-dot path ;
             dup array? [ first ] when
             dup lookup-type [
                 [ unparse write bl ]
-                [ [ pprint ] [ dup string? [ drop ] [ add-using ] if ] bi ] bi*
+                [ [ pprint ] [ add-using ] bi ] bi*
             ] [
                 drop unparse write bl null pprint
                 null add-using
@@ -210,7 +216,7 @@ ERROR: vocab-name-contains-dot path ;
 
 : interesting-words ( vocab -- array )
     words
-    [ { [ "help" word-prop ] [ predicate? ] } 1|| not ] filter
+    [ { [ "help" word-prop ] [ predicate? ] } 1|| ] reject
     natural-sort ;
 
 : interesting-words. ( vocab -- )
@@ -332,7 +338,7 @@ ${example-indent}    ""
 ${example-indent}    ""
 ${example-indent}}
 """
-            interpolate.
+            interpolate
         ] with-variable
     ] with-variable ;