Merge branch 'master' of git://factorcode.org/git/factor

db4
Joe Groff 2009-09-15 17:39:05 -05:00
commit d3ed042c99
2 changed files with 9 additions and 2 deletions

View File

@ -1,6 +1,12 @@
USING: help.html tools.test help.topics kernel ; USING: help.html tools.test help.topics kernel sequences vocabs ;
IN: help.html.tests IN: help.html.tests
[ ] [ "xml" >link help>html drop ] unit-test [ ] [ "xml" >link help>html drop ] unit-test
[ "article-foobar.html" ] [ "foobar" >link topic>filename ] unit-test [ "article-foobar.html" ] [ "foobar" >link topic>filename ] unit-test
[ t ] [ all-vocabs-really [ vocab-spec? ] all? ] unit-test
[ t ] [ all-vocabs-really [ vocab-name "sequences.private" = ] any? ] unit-test
[ f ] [ all-vocabs-really [ vocab-name "scratchpad" = ] any? ] unit-test

View File

@ -73,7 +73,8 @@ M: topic url-of topic>filename ;
dup topic>filename utf8 [ help>html write-xml ] with-file-writer ; dup topic>filename utf8 [ help>html write-xml ] with-file-writer ;
: all-vocabs-really ( -- seq ) : all-vocabs-really ( -- seq )
all-vocabs-recursive >hashtable f over delete-at no-roots remove-redundant-prefixes ; all-vocabs-recursive >hashtable no-roots remove-redundant-prefixes
[ vocab-name "scratchpad" = not ] filter ;
: all-topics ( -- topics ) : all-topics ( -- topics )
[ [