vocabs: use valid-vocab-name? to filter disk vocabs

[factor.git] / core / vocabs / vocabs.factor

diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index 4c53c199b47def890b1255d152a95692115e426c..8e78f7c6788ef8ae3e95ae7728d22dfbf5b566f9 100644 (file)
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -19,11 +19,17 @@ SYMBOLS: +parsing+ +done+ ;
         swap >>name
         H{ } clone >>words ;
 
+<PRIVATE
+
+: valid-vocab-name? ( name -- ? )
+    dup string? [ [ ":/\\ \"" member? ] none? ] [ f ] if ;
+
+PRIVATE>
+
 ERROR: bad-vocab-name name ;
 
 : check-vocab-name ( name -- name )
-    dup string? [ bad-vocab-name ] unless
-    dup [ ":/\\ \"" member? ] any? [ bad-vocab-name ] when ;
+    dup valid-vocab-name? [ bad-vocab-name ] unless ;
 
 TUPLE: vocab-link name ;