\r
<PRIVATE\r
\r
-: vocab-subdirs ( dir -- dirs )\r
- directory-entries [\r
+: visible-dirs ( seq -- seq' )\r
+ [\r
{\r
[ type>> +directory+ = ]\r
[ name>> "." head? not ]\r
} 1&&\r
- ] filter [ name>> ] map! natural-sort ;\r
+ ] filter ;\r
+\r
+: vocab-subdirs ( dir -- dirs )\r
+ directory-entries visible-dirs [ name>> ] map! natural-sort ;\r
\r
: vocab-dir? ( root name -- ? )\r
over\r
[ ensure-vocab-root ] dip\r
[ ((child-vocabs-recursive)) ] { } make ;\r
\r
-: no-rooted ( seq -- seq' ) [ find-vocab-root not ] filter ;\r
+: no-rooted ( seq -- seq' ) [ find-vocab-root ] reject ;\r
\r
: one-level-only? ( name prefix -- ? )\r
?head [ "." split1 nip not ] [ drop f ] if ;\r
\r
PRIVATE>\r
\r
-: no-prefixes ( seq -- seq' ) [ vocab-prefix? not ] filter ;\r
+: no-prefixes ( seq -- seq' ) [ vocab-prefix? ] reject ;\r
\r
: convert-prefixes ( seq -- seq' )\r
- [ dup vocab-prefix? [ name>> vocab-link boa ] when ] map ;\r
+ [ dup vocab-prefix? [ name>> <vocab-link> ] when ] map ;\r
\r
: remove-redundant-prefixes ( seq -- seq' )\r
#! Hack.\r
[ vocab-prefix? ] partition\r
[\r
[ vocab-name ] map fast-set\r
- '[ name>> _ in? not ] filter\r
+ '[ name>> _ in? ] reject\r
convert-prefixes\r
] keep\r
append ;\r
\r
: (load-from-root) ( root prefix -- failures )\r
vocabs-in-root/prefix\r
- [ don't-load? not ] filter no-prefixes\r
+ [ don't-load? ] reject no-prefixes\r
require-all ;\r
\r
: load-from-root ( root prefix -- )\r