vocabs.loader: better fix for append-vocab-dir.

diff --git a/basis/vocabs/files/files.factor b/basis/vocabs/files/files.factor
index 3f6f32fed11a6bad6db90f94fa648110964af889..c9a828ac199490a4d169e8d770bc3ed9766e3259 100644 (file)
--- a/basis/vocabs/files/files.factor
+++ b/basis/vocabs/files/files.factor
@@ -5,7 +5,7 @@ sequences vocabs vocabs.loader ;
 IN: vocabs.files
 
 : vocab-tests-path ( vocab -- path )
-    vocab-name* dup "-tests.factor" append-vocab-dir vocab-append-path ;
+    dup "-tests.factor" append-vocab-dir vocab-append-path ;
 
 : vocab-tests-file ( vocab -- path/f )
     vocab-tests-path dup

diff --git a/basis/vocabs/hierarchy/hierarchy.factor b/basis/vocabs/hierarchy/hierarchy.factor
index 0a5de9b4e276a9e09929f52961e510ac656558c6..f19cc8c57331320ea1491fa9db0c2a18752ec287 100644 (file)
--- a/basis/vocabs/hierarchy/hierarchy.factor
+++ b/basis/vocabs/hierarchy/hierarchy.factor
@@ -38,7 +38,12 @@ ERROR: vocab-root-required root ;
 \r
 : (child-vocabs) ( root prefix -- vocabs )\r
     check-vocab-name\r
-    [ vocab-dir append-path dup exists? [ vocab-subdirs ] [ drop { } ] if ]\r
+    [\r
+        dup ".private" tail? [ 2drop { } ] [\r
+            vocab-dir append-path dup exists?\r
+            [ vocab-subdirs ] [ drop { } ] if\r
+        ] if\r
+    ]\r
     [ nip [ "." append '[ _ prepend ] map! ] unless-empty ]\r
     [ drop '[ _ over vocab-dir? [ >vocab-link ] [ <vocab-prefix> ] if ] map! ]\r
     2tri ;\r

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 135e0ef6efb3e1cbcd5fbdd4606574d7d006abd4..e63482ca81fb16b5357c9b7bdc06f0f6ccabfbe5 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -45,7 +45,7 @@ PRIVATE>
     vocab-name* H{ { CHAR: . CHAR: / } } substitute ;
 
 : append-vocab-dir ( vocab str/f -- path )
-    [ vocab-name "." split ] dip
+    [ vocab-name* "." split ] dip
     [ [ dup last ] dip append suffix ] when*
     "/" join ;
 
@@ -57,10 +57,10 @@ PRIVATE>
     swap find-vocab-root dup [ prepend-path ] [ 2drop f ] if ;
 
 : vocab-source-path ( vocab -- path/f )
-    vocab-name* dup ".factor" append-vocab-dir vocab-append-path ;
+    dup ".factor" append-vocab-dir vocab-append-path ;
 
 : vocab-docs-path ( vocab -- path/f )
-    vocab-name* dup "-docs.factor" append-vocab-dir vocab-append-path ;
+    dup "-docs.factor" append-vocab-dir vocab-append-path ;
 
 SYMBOL: load-help?