vocabs: make source/docs/tests work for private vocabs.

diff --git a/basis/vocabs/files/files.factor b/basis/vocabs/files/files.factor
index 68a6da6c132eff314cd72aedce18a9a1b2d88b9d..3f6f32fed11a6bad6db90f94fa648110964af889 100644 (file)
--- a/basis/vocabs/files/files.factor
+++ b/basis/vocabs/files/files.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.directories io.files io.pathnames kernel make
-sequences vocabs.loader ;
+sequences vocabs vocabs.loader ;
 IN: vocabs.files
 
 : vocab-tests-path ( vocab -- path )
-    dup "-tests.factor" append-vocab-dir vocab-append-path ;
+    vocab-name* dup "-tests.factor" append-vocab-dir vocab-append-path ;
 
 : vocab-tests-file ( vocab -- path/f )
     vocab-tests-path dup

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index fec916667e577329bd05152321b2fcdba01fecce..e69a6a20c8d53186ff45b84bddf524fb4d104f5e 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -57,10 +57,10 @@ PRIVATE>
     swap find-vocab-root dup [ prepend-path ] [ 2drop f ] if ;
 
 : vocab-source-path ( vocab -- path/f )
-    dup ".factor" append-vocab-dir vocab-append-path ;
+    vocab-name* dup ".factor" append-vocab-dir vocab-append-path ;
 
 : vocab-docs-path ( vocab -- path/f )
-    dup "-docs.factor" append-vocab-dir vocab-append-path ;
+    vocab-name* dup "-docs.factor" append-vocab-dir vocab-append-path ;
 
 SYMBOL: load-help?
 

diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index edffd079c87b47a853d2efa9cc21903bed9520a2..24fc4fdda4b78ae674ca8d2dea28975e4d1dd3d4 100644 (file)
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -41,6 +41,9 @@ M: vocab-link vocab-name name>> ;
 
 M: object vocab-name check-vocab-name ;
 
+: vocab-name* ( vocab-spec -- name )
+    vocab-name ".private" ?tail drop ;
+
 GENERIC: lookup-vocab ( vocab-spec -- vocab )
 
 M: vocab lookup-vocab ;