vocabs.refresh: slight cleanup.

diff --git a/basis/vocabs/refresh/refresh-tests.factor b/basis/vocabs/refresh/refresh-tests.factor
index 31e7f7c58757922546b22083856833110956f78e..e4cfdc96fc24fe4ba1810d9c46e6d5461731134a 100644 (file)
--- 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 901becbf0f5f04950cd9e246686524c38802862e..948f2b1ac3596ec4925d521eb5bd90ccc63d9f27 100644 (file)
--- 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