vocabs.loader: prevent create-vocab if check-vocab fails.

diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index 5f27237f8ed7bf6d5a46624ff1247d1821b3c2e0..e7f09ed8d6237629400937f53abb367d93ac9626 100644 (file)
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -1,7 +1,8 @@
 USING: accessors compiler.units continuations debugger
 definitions eval io.streams.string kernel math namespaces parser
-prettyprint sequences sets source-files tools.test vocabs
-vocabs.files vocabs.loader vocabs.parser vocabs.refresh words ;
+prettyprint sequences sets source-files system tools.test vocabs
+vocabs.files vocabs.loader vocabs.metadata vocabs.parser
+vocabs.refresh words ;
 IN: vocabs.loader.tests
 
 ! This vocab should not exist, but just in case...
@@ -192,3 +193,6 @@ forget-junk
 [
     "mnop" [ "vocabs.loader.test." swap suffix forget-vocab ] each
 ] with-compilation-unit
+
+[ os unix? "windows" "unix" ? require ]
+[ error>> unsupported-platform? ] must-fail-with

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index b1d6e3135958ee473fab8f9bae92639d11d3eb04..7deb2012291459433f9bd7fa9ec85de5b63a5629 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -159,7 +159,9 @@ M: vocab (require)
 M: vocab-link (require)
     vocab-name (require) ;
 
-M: string (require) create-vocab (require) ;
+M: string (require)
+   dup check-vocab-hook get call( vocab -- )
+    create-vocab (require) ;
 
 PRIVATE>