vocabs.refresh.monitor: rename words to do what they say

diff --git a/basis/vocabs/refresh/monitor/monitor-tests.factor b/basis/vocabs/refresh/monitor/monitor-tests.factor
index b64d02ecb2a7122bd362140712c159110d69771c..0e46cfcd736d179c44d95da414468195d3b9e9f2 100644 (file)
--- a/basis/vocabs/refresh/monitor/monitor-tests.factor
+++ b/basis/vocabs/refresh/monitor/monitor-tests.factor
@@ -1,6 +1,6 @@
 USING: tools.test vocabs.refresh.monitor io.pathnames ;
 IN: vocabs.refresh.monitor.tests
 
-{ "kernel" } [ "core/kernel/kernel.factor" path>vocab ] unit-test
-{ "kernel" } [ "core/kernel/" path>vocab ] unit-test
-{ "kernel" } [ "core/kernel/" resource-path path>vocab ] unit-test
+{ "kernel" } [ "core/kernel/kernel.factor" path>vocab-name ] unit-test
+{ "kernel" } [ "core/kernel/" path>vocab-name ] unit-test
+{ "kernel" } [ "core/kernel/" resource-path path>vocab-name ] unit-test

diff --git a/basis/vocabs/refresh/monitor/monitor.factor b/basis/vocabs/refresh/monitor/monitor.factor
index 26e77eee91d7b6ae2a305f9088949682a98d65fd..3186c2e352e743c18585f25cf9ef99399a08e4e7 100644 (file)
--- a/basis/vocabs/refresh/monitor/monitor.factor
+++ b/basis/vocabs/refresh/monitor/monitor.factor
@@ -13,7 +13,7 @@ TR: convert-separators "/\\" ".." ;
     trim-tail-separators
     convert-separators ;
 
-: path>vocab-name ( path -- vocab )
+: path>vocab-parent-dir ( path -- path' )
     dup ".factor" tail? [ parent-directory ] when ;
 
 : chop-vocab-root ( path -- path' )
@@ -24,8 +24,8 @@ TR: convert-separators "/\\" ".." ;
     [ head? ] with find nip
     ?head drop ;
 
-: path>vocab ( path -- vocab )
-    chop-vocab-root path>vocab-name vocab-dir>vocab-name ;
+: path>vocab-name ( path -- vocab-name )
+    chop-vocab-root path>vocab-parent-dir vocab-dir>vocab-name ;
 
 : monitor-loop ( monitor -- )
     ! On OS X, monitors give us the full path, so we chop it
@@ -33,7 +33,7 @@ TR: convert-separators "/\\" ".." ;
     [
         next-change path>>
         [
-            path>vocab
+            path>vocab-name
             [ changed-vocab ] [ reset-cache ] bi
         ] [
             [