From b957ad168492110483ff7b6520babc104a399e56 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 10 Aug 2012 14:39:53 -0700
Subject: [PATCH] vocabs: make source/docs/tests work for private vocabs.

---
 basis/vocabs/files/files.factor  | 4 ++--
 core/vocabs/loader/loader.factor | 4 ++--
 core/vocabs/vocabs.factor        | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/basis/vocabs/files/files.factor b/basis/vocabs/files/files.factor
index 68a6da6c13..3f6f32fed1 100644
--- 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 fec916667e..e69a6a20c8 100644
--- 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 edffd079c8..24fc4fdda4 100644
--- 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 ;