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

refresh-all bug fix

release
Slava Pestov 2007-11-08 01:57:56 -05:00
parent 3367467205
commit 6ccf4ddb24
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,9 +119,10 @@ SYMBOL: load-help?
"To define one, refer to \\ MAIN: help" print "To define one, refer to \\ MAIN: help" print
] ?if ; ] ?if ;
: modified ( assoc -- seq ) : modified ( seq quot -- seq )
[ nip dup [ source-modified? ] when ] assoc-subset [ dup ] swap compose { } map>assoc
keys ; [ nip ] assoc-subset
[ nip source-modified? ] assoc-subset keys ; inline
: vocab-path+ ( vocab path -- newpath ) : vocab-path+ ( vocab path -- newpath )
swap vocab-root dup [ swap path+ ] [ 2drop f ] if ; swap vocab-root dup [ swap path+ ] [ 2drop f ] if ;
@ -136,19 +137,26 @@ SYMBOL: load-help?
dup vocab-docs vocab-path+ ; dup vocab-docs vocab-path+ ;
: modified-sources ( vocabs -- seq ) : modified-sources ( vocabs -- seq )
[ dup vocab-source-path ] { } map>assoc modified ; [ vocab-source-path ] modified ;
: modified-docs ( vocabs -- seq ) : modified-docs ( vocabs -- seq )
[ dup vocab-docs-path ] { } map>assoc modified ; [ vocab-docs-path ] modified ;
: (refresh) ( prefix -- seq ) : update-roots ( vocabs -- )
[ dup find-vocab-root swap vocab set-vocab-root ] each ;
: to-refresh ( prefix -- seq )
child-vocabs child-vocabs
dup modified-sources swap modified-docs 2dup dup update-roots
dup modified-sources swap modified-docs ;
: do-refresh ( modified-sources modified-docs -- )
2dup
[ f swap set-vocab-docs-loaded? ] each [ f swap set-vocab-docs-loaded? ] each
[ f swap set-vocab-source-loaded? ] each [ f swap set-vocab-source-loaded? ] each
append prune dup [ [ require ] each ] no-parse-hook ; append prune [ [ require ] each ] no-parse-hook ;
: refresh ( prefix -- ) (refresh) drop ; : refresh ( prefix -- ) to-refresh do-refresh ;
: refresh-all ( -- ) "" refresh ; : refresh-all ( -- ) "" refresh ;

3
extra/tools/test/test.factor
View File

@ -76,4 +76,5 @@ TUPLE: expected-error ;
: test-all ( -- ) "" test ; : test-all ( -- ) "" test ;
: test-changes ( -- ) "" (refresh) run-vocab-tests ; : test-changes ( -- )
"" to-refresh dupd do-refresh run-vocab-tests ;