From ccbde89968727d6bf254c3da98426b19c3bc98da Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 16 Jul 2016 16:21:45 -0700 Subject: [PATCH] vocabs.loader: one vocab-exists? word. --- basis/ui/tools/listener/listener.factor | 3 --- core/vocabs/loader/loader.factor | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index ca8b2e94d2..a31b08f293 100644 --- 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 1de8ecabd5..a92ebdd87f 100644 --- 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* ; -- 2.34.1