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

Clean up code a bit

db4
Slava Pestov 2008-02-11 16:47:35 -06:00
parent d976b11445
commit a6ba0cb392
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,6 @@ SYMBOL: load-help?
dup first vocab-heading. dup first vocab-heading.
dup second print-error dup second print-error
drop ; drop ;
! third "Traceback" swap write-object ;
: load-failures. ( failures -- ) : load-failures. ( failures -- )
[ load-error. nl ] each ; [ load-error. nl ] each ;
@ -165,15 +164,12 @@ SYMBOL: blacklist
: require-all ( vocabs -- failures ) : require-all ( vocabs -- failures )
[ [
V{ } clone blacklist set V{ } clone blacklist set
[
[ [
[ require ] [ require ]
[ [ >r vocab-name r> 2array blacklist get push ]
over vocab-name blacklist get push recover
error-continuation get 3array ,
] recover
] each ] each
] { } make blacklist get
] with-compiler-errors ; ] with-compiler-errors ;
: do-refresh ( modified-sources modified-docs -- ) : do-refresh ( modified-sources modified-docs -- )
@ -201,7 +197,7 @@ M: vocab-link (load-vocab)
vocab-name (load-vocab) ; vocab-name (load-vocab) ;
TUPLE: blacklisted-vocab name ; TUPLE: blacklisted-vocab name ;
!
: blacklisted-vocab ( name -- * ) : blacklisted-vocab ( name -- * )
\ blacklisted-vocab construct-boa throw ; \ blacklisted-vocab construct-boa throw ;
@ -211,7 +207,7 @@ M: blacklisted-vocab error.
" vocabulary which failed to load" print ; " vocabulary which failed to load" print ;
[ [
dup vocab-name blacklist get member? [ dup vocab-name blacklist get key? [
vocab-name blacklisted-vocab vocab-name blacklisted-vocab
] [ ] [
[ [