vocabs.loader: tweak platform checking logic
parent
1b508b9c37
commit
2ab1be755c
|
@ -1,4 +1,4 @@
|
|||
! Copyright (C) 2007, 2009 Eduardo Cavazos, Slava Pestov.
|
||||
! Copyright (C) 2007, 2010 Eduardo Cavazos, Slava Pestov.
|
||||
! See http://factorcode.org/license.txt for BSD license.
|
||||
USING: namespaces make sequences io io.files io.pathnames kernel
|
||||
assocs words vocabs definitions parser continuations hashtables
|
||||
|
@ -57,9 +57,15 @@ PRIVATE>
|
|||
|
||||
SYMBOL: load-help?
|
||||
|
||||
! Defined by vocabs.metadata
|
||||
SYMBOL: check-vocab-hook
|
||||
|
||||
check-vocab-hook [ [ drop ] ] initialize
|
||||
|
||||
<PRIVATE
|
||||
|
||||
: load-source ( vocab -- )
|
||||
dup check-vocab-hook get call( vocab -- )
|
||||
[
|
||||
+parsing+ >>source-loaded?
|
||||
dup vocab-source-path [ parse-file ] [ [ ] ] if*
|
||||
|
@ -99,11 +105,6 @@ PRIVATE>
|
|||
|
||||
SYMBOL: blacklist
|
||||
|
||||
! Defined by vocabs.metadata
|
||||
SYMBOL: check-vocab-hook
|
||||
|
||||
check-vocab-hook [ [ drop ] ] initialize
|
||||
|
||||
<PRIVATE
|
||||
|
||||
: add-to-blacklist ( error vocab -- )
|
||||
|
@ -122,10 +123,7 @@ M: vocab (load-vocab)
|
|||
M: vocab-link (load-vocab)
|
||||
vocab-name (load-vocab) ;
|
||||
|
||||
M: string (load-vocab)
|
||||
[ check-vocab-hook get call( vocab -- ) ]
|
||||
[ create-vocab (load-vocab) ]
|
||||
bi ;
|
||||
M: string (load-vocab) create-vocab (load-vocab) ;
|
||||
|
||||
PRIVATE>
|
||||
|
||||
|
|
Loading…
Reference in New Issue