steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vocabs.loader: tweak platform checking logic

db4
Slava Pestov 2010-02-22 13:16:34 +13:00
parent 1b508b9c37
commit 2ab1be755c
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/vocabs/loader/loader.factor
View File

@ -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. ! See http://factorcode.org/license.txt for BSD license.
USING: namespaces make sequences io io.files io.pathnames kernel USING: namespaces make sequences io io.files io.pathnames kernel
assocs words vocabs definitions parser continuations hashtables assocs words vocabs definitions parser continuations hashtables
@ -57,9 +57,15 @@ PRIVATE>
SYMBOL: load-help? SYMBOL: load-help?
! Defined by vocabs.metadata
SYMBOL: check-vocab-hook
check-vocab-hook [ [ drop ] ] initialize
<PRIVATE <PRIVATE
: load-source ( vocab -- ) : load-source ( vocab -- )
dup check-vocab-hook get call( vocab -- )
[ [
+parsing+ >>source-loaded? +parsing+ >>source-loaded?
dup vocab-source-path [ parse-file ] [ [ ] ] if* dup vocab-source-path [ parse-file ] [ [ ] ] if*
@ -99,11 +105,6 @@ PRIVATE>
SYMBOL: blacklist SYMBOL: blacklist
! Defined by vocabs.metadata
SYMBOL: check-vocab-hook
check-vocab-hook [ [ drop ] ] initialize
<PRIVATE <PRIVATE
: add-to-blacklist ( error vocab -- ) : add-to-blacklist ( error vocab -- )
@ -122,10 +123,7 @@ M: vocab (load-vocab)
M: vocab-link (load-vocab) M: vocab-link (load-vocab)
vocab-name (load-vocab) ; vocab-name (load-vocab) ;
M: string (load-vocab) M: string (load-vocab) create-vocab (load-vocab) ;
[ check-vocab-hook get call( vocab -- ) ]
[ create-vocab (load-vocab) ]
bi ;
PRIVATE> PRIVATE>