From 07d92b48e1f30036e414b3d2c7e1dbd8af04d8be Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 25 Feb 2018 14:12:54 -0800 Subject: [PATCH] vocabs.refresh: slight cleanup. --- basis/vocabs/refresh/refresh-tests.factor | 2 +- basis/vocabs/refresh/refresh.factor | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/basis/vocabs/refresh/refresh-tests.factor b/basis/vocabs/refresh/refresh-tests.factor index 31e7f7c587..e4cfdc96fc 100644 --- a/basis/vocabs/refresh/refresh-tests.factor +++ b/basis/vocabs/refresh/refresh-tests.factor @@ -4,6 +4,6 @@ USING: vocabs.refresh tools.test continuations namespaces ; { } [ changed-vocabs get-global f changed-vocabs set-global - [ t ] [ "kernel" changed-vocab-by-name? ] unit-test + { t } [ "kernel" changed-vocab? ] unit-test [ "kernel" changed-vocab ] [ changed-vocabs set-global ] [ ] cleanup ] unit-test diff --git a/basis/vocabs/refresh/refresh.factor b/basis/vocabs/refresh/refresh.factor index 901becbf0f..948f2b1ac3 100644 --- a/basis/vocabs/refresh/refresh.factor +++ b/basis/vocabs/refresh/refresh.factor @@ -20,7 +20,7 @@ IN: vocabs.refresh SYMBOL: changed-vocabs -: changed-vocab ( vocab -- ) +: changed-vocab ( vocab-name -- ) dup lookup-vocab changed-vocabs get and [ changed-vocabs get adjoin ] [ drop ] if ; @@ -30,13 +30,13 @@ SYMBOL: changed-vocabs : mark-unchanged-vocabs ( vocab-names -- ) [ mark-unchanged-vocab ] each ; -: changed-vocab-by-name? ( vocab -- ? ) +: changed-vocab? ( vocab-name -- ? ) changed-vocabs get [ in? ] [ drop t ] if* ; : (to-refresh) ( vocab-name loaded? path -- ? ) [ swap [ - swap changed-vocab-by-name? [ + swap changed-vocab? [ source-modified? ] [ drop f ] if ] [ 2drop t ] if @@ -66,8 +66,7 @@ SYMBOL: changed-vocabs [ [ [ lookup-vocab f >>source-loaded? drop ] each ] [ [ lookup-vocab f >>docs-loaded? drop ] each ] bi* - ] - [ + ] [ union [ mark-unchanged-vocabs ] [ require-all ] bi