From 9660a9c2d6e62a89f3ab890cff298ce07eae243b Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 17 Feb 2008 17:08:52 -0600 Subject: [PATCH] Another fix --- core/bootstrap/primitives.factor | 2 +- core/vocabs/loader/loader.factor | 7 ------- core/vocabs/vocabs.factor | 7 ++++++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index 05850e10ee..97712972f3 100755 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -98,7 +98,7 @@ H{ } clone update-map set [ over "type" word-prop dup \ tag-mask get < \ tag \ type ? , , \ eq? , - ] [ ] make define-predicate ; + ] [ ] make define-predicate* ; : register-builtin ( class -- ) dup "type" word-prop builtins get set-nth ; diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index a05cd2fa8c..2d53ed82e2 100755 --- a/core/vocabs/loader/loader.factor +++ b/core/vocabs/loader/loader.factor @@ -69,13 +69,6 @@ M: vocab-link vocab-root vocab-tests % ] { } make ; -TUPLE: no-vocab name ; - -: no-vocab ( name -- * ) - vocab-name \ no-vocab construct-boa throw ; - -M: no-vocab summary drop "Vocabulary does not exist" ; - SYMBOL: load-help? : source-was-loaded t swap set-vocab-source-loaded? ; diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor index 1158d60951..720a1ef645 100755 --- a/core/vocabs/vocabs.factor +++ b/core/vocabs/vocabs.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2007 Eduardo Cavazos, Slava Pestov. +! Copyright (C) 2007, 2008 Eduardo Cavazos, Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: assocs strings kernel sorting namespaces sequences definitions ; @@ -113,3 +113,8 @@ UNION: vocab-spec vocab vocab-link ; vocab-name dictionary get delete-at ; M: vocab-spec forget* forget-vocab ; + +TUPLE: no-vocab name ; + +: no-vocab ( name -- * ) + vocab-name \ no-vocab construct-boa throw ;