tools.scaffold: don't use sequences.extras.

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 0d73e7a2d512ee1fe279aecef0d6e7e7002fe9e7..0b9e1e8085cb117048371bedac91c5a30b086b73 100644 (file)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -5,9 +5,9 @@ classes classes.error combinators combinators.short-circuit
 continuations eval hashtables help.markup interpolate io
 io.directories io.encodings.utf8 io.files io.pathnames
 io.streams.string kernel math math.parser namespaces prettyprint
 continuations eval hashtables help.markup interpolate io
 io.directories io.encodings.utf8 io.files io.pathnames
 io.streams.string kernel math math.parser namespaces prettyprint

-quotations sequences sequences.extras sets sorting splitting
-strings system timers unicode urls vocabs vocabs.loader
-vocabs.metadata words words.symbol ;
+quotations sequences sets sorting splitting strings system
+timers unicode urls vocabs vocabs.loader vocabs.metadata words
+words.symbol ;

 IN: tools.scaffold
 
 SYMBOL: developer-name
 IN: tools.scaffold
 
 SYMBOL: developer-name


@@ -393,13 +393,9 @@ ${example-indent}}
     ".factor-roots" scaffold-rc ;
 
 : make-unit-test ( answer code -- str )
     ".factor-roots" scaffold-rc ;
 
 : make-unit-test ( answer code -- str )

-   [
-        prepend-lines-with-spaces
-        "{\n" "\n}" surround
-    ] [
-        prepend-lines-with-spaces
-        "[\n" "\n] unit-test\n" surround
-    ] bi* " " glue ;
+    [ split-lines [ "    " prepend ] map "\n" join ] bi@
+    [ "{\n" "\n}" surround ] [ "[\n" "\n] unit-test\n" surround ] bi*
+    " " glue ;

 
 : scaffold-unit-test ( -- str/f )
     read-contents dup "" = [
 
 : scaffold-unit-test ( -- str/f )
     read-contents dup "" = [


@@ -409,7 +405,7 @@ ${example-indent}}
     ] if ;
 
 : scaffold-unit-tests ( -- str )
     ] if ;
 
 : scaffold-unit-tests ( -- str )

-    [ scaffold-unit-test ] loop>array "\n\n" join ;
+    [ scaffold-unit-test dup ] [ ] produce nip "\n\n" join ;

 
 HOOK: scaffold-emacs os ( -- )
 
 
 HOOK: scaffold-emacs os ( -- )