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

clean up vocab loader a bit

db4
Doug Coleman 2008-08-30 13:31:00 -05:00
parent abda27b0d2
commit e5bec5bbb8
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
USING: namespaces sequences io.files kernel assocs words vocabs USING: namespaces sequences io.files kernel assocs words vocabs
definitions parser continuations io hashtables sorting definitions parser continuations io hashtables sorting
source-files arrays combinators strings system math.parser source-files arrays combinators strings system math.parser
compiler.errors splitting init ; compiler.errors splitting init accessors ;
IN: vocabs.loader IN: vocabs.loader
SYMBOL: vocab-roots SYMBOL: vocab-roots
@ -51,28 +51,19 @@ H{ } clone root-cache set-global
SYMBOL: load-help? SYMBOL: load-help?
: source-was-loaded ( vocab -- ) t swap set-vocab-source-loaded? ; : load-source ( vocab -- vocab )
f >>source-loaded?
[ vocab-source-path [ parse-file ] [ [ ] ] if* ] keep
t >>source-loaded?
[ [ % ] [ call ] if-bootstrapping ] dip ;
: source-wasn't-loaded ( vocab -- ) f swap set-vocab-source-loaded? ;
: load-source ( vocab -- ) : load-docs ( vocab -- vocab )
[ source-wasn't-loaded ]
[ vocab-source-path [ parse-file ] [ [ ] ] if* ]
[ source-was-loaded ]
tri
[ % ] [ call ] if-bootstrapping ;
: docs-were-loaded ( vocab -- ) t swap set-vocab-docs-loaded? ;
: docs-weren't-loaded ( vocab -- ) f swap set-vocab-docs-loaded? ;
: load-docs ( vocab -- )
load-help? get [ load-help? get [
[ docs-weren't-loaded ] f >>docs-loaded?
[ vocab-docs-path [ ?run-file ] when* ] [ vocab-docs-path [ ?run-file ] when* ] keep
[ docs-were-loaded ] t >>docs-loaded?
tri ] when ;
] [ drop ] if ;
: reload ( name -- ) : reload ( name -- )
[ [
@ -100,8 +91,8 @@ GENERIC: (load-vocab) ( name -- )
M: vocab (load-vocab) M: vocab (load-vocab)
[ [
dup vocab-source-loaded? [ dup load-source ] unless dup vocab-source-loaded? [ load-source ] unless
dup vocab-docs-loaded? [ dup load-docs ] unless dup vocab-docs-loaded? [ load-docs ] unless
drop drop
] [ [ swap add-to-blacklist ] keep rethrow ] recover ; ] [ [ swap add-to-blacklist ] keep rethrow ] recover ;