steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

help.html: remove funky vocab-prefix hack.

windows-high-dpi
John Benediktsson 2018-02-24 15:40:23 -08:00
parent 923944f41e
commit f96fb3bcc8
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/help/html/html.factor
View File

@ -127,7 +127,7 @@ M: pathname url-of
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-disk-vocabs-recursive no-roots remove-redundant-prefixes all-disk-vocabs-recursive no-roots no-prefixes
[ vocab-name "scratchpad" = ] reject ; [ vocab-name "scratchpad" = ] reject ;
: all-topics ( -- topics ) : all-topics ( -- topics )

2
basis/help/vocabs/vocabs.factor
View File

@ -27,7 +27,7 @@ IN: help.vocabs
$heading ; $heading ;
: $vocabs ( seq -- ) : $vocabs ( seq -- )
convert-prefixes [ vocab-row ] map vocab-headings prefix $table ; [ vocab-row ] map vocab-headings prefix $table ;
: $vocab-roots ( assoc -- ) : $vocab-roots ( assoc -- )
[ [

13
basis/vocabs/hierarchy/hierarchy.factor
View File

@ -71,19 +71,6 @@ PRIVATE>
: no-prefixes ( seq -- seq' ) [ vocab-prefix? ] reject ; : no-prefixes ( seq -- seq' ) [ vocab-prefix? ] reject ;
: convert-prefixes ( seq -- seq' )
[ dup vocab-prefix? [ name>> <vocab-link> ] when ] map ;
: remove-redundant-prefixes ( seq -- seq' )
! Hack.
[ vocab-prefix? ] partition
[
[ vocab-name ] map fast-set
'[ name>> _ in? ] reject
convert-prefixes
] keep
append ;
: no-roots ( assoc -- seq ) values concat ; : no-roots ( assoc -- seq ) values concat ;
: filter-vocabs ( assoc -- seq ) : filter-vocabs ( assoc -- seq )