vocabs: remove little used words.

vocabs:vocab-name* => editors.private:public-vocab-name.

diff --git a/basis/editors/editors.factor b/basis/editors/editors.factor
index 8e4802c17b010ae05d79898ae0015d8f9fe4faf0..7b785bac4153c76e38a98b90a68728a444de95da 100644 (file)
--- a/basis/editors/editors.factor
+++ b/basis/editors/editors.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs calendar continuations debugger
 definitions io io.launcher io.pathnames kernel namespaces
-prettyprint sequences source-files.errors strings threads
-tools.crossref vocabs vocabs.files vocabs.hierarchy
+prettyprint sequences source-files.errors splitting strings
+threads tools.crossref vocabs vocabs.files vocabs.hierarchy
 vocabs.loader vocabs.metadata words ;
 IN: editors
 
@@ -53,8 +53,15 @@ M: cannot-find-source error.
 
 DEFER: edit
 
+<PRIVATE
+
+: public-vocab-name ( vocab-spec -- name )
+    vocab-name ".private" ?tail drop ;
+
+PRIVATE>
+
 : edit-vocab ( vocab -- )
-    vocab-name* >vocab-link edit ;
+    public-vocab-name >vocab-link edit ;
 
 GENERIC: edit ( object -- )
 
@@ -89,7 +96,7 @@ M: string edit edit-vocab ;
 GENERIC: edit-docs ( object -- )
 
 M: object edit-docs
-    vocab-name* vocab-docs-path 1 edit-location ;
+    public-vocab-name vocab-docs-path 1 edit-location ;
 
 M: word edit-docs
     dup "help-loc" word-prop
@@ -100,7 +107,7 @@ M: word edit-docs
 GENERIC: edit-tests ( object -- )
 
 M: object edit-tests
-    vocab-name* vocab-tests-path 1 edit-location ;
+    public-vocab-name vocab-tests-path 1 edit-location ;
 
 M: word edit-tests vocabulary>> edit-tests ;
 

diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index a8dd27f2e9e3bac5ca2928171d879ee6bade194b..66f706eac72c9489b9f83549eb822f53f30c2b36 100644 (file)
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -41,12 +41,6 @@ M: vocab-link vocab-name name>> ;
 
 M: object vocab-name check-vocab-name ;
 
-: vocab-name* ( vocab-spec -- name )
-    vocab-name ".private" ?tail drop ;
-
-: private-vocab? ( vocab-spec -- ? )
-    vocab-name ".private" tail? ;
-
 GENERIC: lookup-vocab ( vocab-spec -- vocab )
 
 M: vocab lookup-vocab ;
@@ -148,6 +142,7 @@ INSTANCE: vocab-spec definition-mixin
 GENERIC: require ( object -- )
 
 M: vocab require name>> require ;
+
 M: vocab-link require name>> require ;
 
 ! When calling "foo.private" require, load "foo" instead, but only when