vocabs.loader: one vocab-exists? word.

diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index ca8b2e94d24915f85215620b39b6deaf8479a97b..a31b08f293828e5a540ac10ef68f6ad9dd772647 100644 (file)
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -44,9 +44,6 @@ M: interactor manifest>>
         manifest swap assoc-stack
     ] if ;
 
-: vocab-exists? ( name -- ? )
-    '[ _ { [ lookup-vocab ] [ find-vocab-root ] } 1|| ] [ drop f ] recover ;
-
 GENERIC: (word-at-caret) ( token completion-mode -- obj )
 
 M: vocab-completion (word-at-caret)

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 1de8ecabd5f974952607030b6608a0f8e8851e5f..a92ebdd87fc6eb0cf2b26a5f22b8e2001607eaac 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -55,6 +55,9 @@ PRIVATE>
         ] if
     ] cache ;
 
+: vocab-exists? ( name -- ? )
+    dup lookup-vocab [ ] [ find-vocab-root ] ?if ;
+
 : vocab-append-path ( vocab path -- newpath )
     swap find-vocab-root [ prepend-path ] [ drop f ] if* ;