Rename vocab to lookup-vocab

diff --git a/basis/bootstrap/help/help.factor b/basis/bootstrap/help/help.factor
index f77829ae860ec5cdcdf2a965d43118e8288761af..4d0f1e584c174071ce53334b51260acded48aee1 100644 (file)
--- a/basis/bootstrap/help/help.factor
+++ b/basis/bootstrap/help/help.factor
@@ -9,7 +9,7 @@ IN: bootstrap.help
 
     t load-help? set-global
 
-    [ dup vocab [ ] [ no-vocab ] ?if ] load-vocab-hook [
+    [ dup lookup-vocab [ ] [ no-vocab ] ?if ] load-vocab-hook [
         dictionary get values
         [ docs-loaded?>> not ] filter
         [ load-docs ] each

diff --git a/basis/bootstrap/ui/tools/tools.factor b/basis/bootstrap/ui/tools/tools.factor
index 3efd15698301969c7343453d93bf4a5983c599ce..bae72d774c7b05667a5ad00acc284f9a3878fcb5 100644 (file)
--- a/basis/bootstrap/ui/tools/tools.factor
+++ b/basis/bootstrap/ui/tools/tools.factor
@@ -1,7 +1,7 @@
 USING: kernel vocabs vocabs.loader sequences system ;
 
 { "ui" "help" "tools" }
-[ "bootstrap." prepend vocab ] all? [
+[ "bootstrap." prepend lookup-vocab ] all? [
     "ui.tools" require
 
     { "ui.backend.cocoa" } "ui.backend.cocoa.tools" require-when

diff --git a/basis/editors/editors.factor b/basis/editors/editors.factor
index a99849aa20014a2b6cce9bfd406c16a3eb2deb57..38978d3dc2f5de5d0e2a0e76de127717af48be58 100644 (file)
--- a/basis/editors/editors.factor
+++ b/basis/editors/editors.factor
@@ -47,7 +47,7 @@ M: object edit
 M: link edit name>> edit ;
 
 M: string edit
-    dup vocab [ edit ] [ cannot-find-source ] ?if ;
+    dup lookup-vocab [ edit ] [ cannot-find-source ] ?if ;
 
 : edit-error ( error -- )
     [ error-file ] [ error-line ] bi

diff --git a/basis/help/lint/checks/checks.factor b/basis/help/lint/checks/checks.factor
index cd389d6367de3e22db17a2fcd1a4e764f519cdc2..a8b27e9b697ba7ec660527cf69cc4647c8a78659 100644 (file)
--- a/basis/help/lint/checks/checks.factor
+++ b/basis/help/lint/checks/checks.factor
@@ -108,7 +108,7 @@ SYMBOL: vocab-articles
     ] each ;
 
 : vocab-exists? ( name -- ? )
-    [ vocab ] [ all-vocabs get member? ] bi or ;
+    [ lookup-vocab ] [ all-vocabs get member? ] bi or ;
 
 : check-modules ( element -- )
     \ $vocab-link swap elements [

diff --git a/basis/help/markup/markup.factor b/basis/help/markup/markup.factor
index 38659efa8b80760e41ddac884842003df5862871..d0f9c98acc6dab5392ea729d15d978d9379af8b8 100644 (file)
--- a/basis/help/markup/markup.factor
+++ b/basis/help/markup/markup.factor
@@ -269,7 +269,7 @@ PRIVATE>
     [ [ ($link) ] textual-list ] ($span) ;
 
 : $vocab-links ( vocabs -- )
-    [ vocab ] map $links ;
+    [ lookup-vocab ] map $links ;
 
 : $breadcrumbs ( topics -- )
     [ [ ($link) ] " > " (textual-list) ] ($span) ;

diff --git a/basis/help/vocabs/vocabs.factor b/basis/help/vocabs/vocabs.factor
index d92ca5d91e41a79cc0fa98660367428de0663ef9..a42b417223287a354182502876365bf9360af31e 100644 (file)
--- a/basis/help/vocabs/vocabs.factor
+++ b/basis/help/vocabs/vocabs.factor
@@ -12,7 +12,7 @@ FROM: vocabs.hierarchy => child-vocabs ;
 IN: help.vocabs
 
 : about ( vocab -- )
-    [ require ] [ vocab help ] bi ;
+    [ require ] [ lookup-vocab help ] bi ;
 
 : vocab-row ( vocab -- row )
     [ <$pretty-link> ] [ vocab-summary ] bi 2array ;
@@ -226,7 +226,7 @@ C: <vocab-author> vocab-author
 
 : describe-words ( vocab -- )
     {
-        { [ dup vocab ] [ words $words ] }
+        { [ dup lookup-vocab ] [ words $words ] }
         { [ dup find-vocab-root ] [ vocab-is-not-loaded ] }
         [ drop ]
     } cond ;

diff --git a/basis/listener/listener.factor b/basis/listener/listener.factor
index ea70a4ca46a816d01f5e22d09ebab969c24a06f8..bd47f63aa835214b7eab01718bdc6d2e41e8b171 100644 (file)
--- a/basis/listener/listener.factor
+++ b/basis/listener/listener.factor
@@ -190,9 +190,9 @@ SYMBOL: interactive-vocabs
 
 : only-use-vocabs ( vocabs -- )
     clear-manifest
-    [ vocab ] filter
+    [ lookup-vocab ] filter
     [
-        vocab
+        lookup-vocab
         [ find-vocab-root not ]
         [ source-loaded?>> +done+ eq? ] bi or
     ] filter

diff --git a/basis/see/see.factor b/basis/see/see.factor
index df6eac1cca0bcf6f92195f509b05513e5a34ecf5..0c02df37973b72cbc821dba6200286f1bc191e50 100644 (file)
--- a/basis/see/see.factor
+++ b/basis/see/see.factor
@@ -47,7 +47,7 @@ M: word print-stack-effect? drop t ;
 <PRIVATE
 
 : seeing-word ( word -- )
-    vocabulary>> dup [ vocab ] when pprinter-in set ;
+    vocabulary>> dup [ lookup-vocab ] when pprinter-in set ;
 
 : word-synopsis ( word -- )
     {

diff --git a/basis/tools/profiler/profiler.factor b/basis/tools/profiler/profiler.factor
index f002d950324cb1e62bba340ccbb3dba6bf58e7ca..f95980ec28b2909fea910c86e793c6d6429e20ea 100644 (file)
--- a/basis/tools/profiler/profiler.factor
+++ b/basis/tools/profiler/profiler.factor
@@ -56,7 +56,7 @@ IN: tools.profiler
 
 : vocab-profile. ( vocab -- )
     "Call counts for words in the " write
-    dup dup vocab write-object
+    dup dup lookup-vocab write-object
     " vocabulary:" print
     words counters counters. ;
 

diff --git a/basis/tools/test/test.factor b/basis/tools/test/test.factor
index b222630b4b28c8b31b2f253ab719a9d3939b1339..47602e78f50df873c445ad83fc6aecec97df3050 100644 (file)
--- a/basis/tools/test/test.factor
+++ b/basis/tools/test/test.factor
@@ -136,7 +136,7 @@ SYMBOL: forget-tests?
     [ [ [ forget-source ] each ] with-compilation-unit ] [ drop ] if ;
 
 : test-vocab ( vocab -- )
-    vocab dup [
+    lookup-vocab dup [
         dup source-loaded?>> [
             vocab-tests
             [ [ run-test-file ] each ]

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index c9c2201e33afda008034a87dbd868af600a26f94..0adaa4028cdb98dfd1ed9d076e762a782375bc74 100644 (file)
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -79,7 +79,7 @@ M: browser-gadget handle-gesture
     {
         [ key? ]
         [ [ dup word-link? [ name>> ] when ] dip key? ]
-        [ [ dup vocab-link? [ vocab ] when ] dip key? ]
+        [ [ dup vocab-link? [ lookup-vocab ] when ] dip key? ]
     } 2|| ;
 
 M: browser-gadget definitions-changed ( assoc browser -- )

diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index dbcab33776f852b45871ad28bbb500b4db844a67..38035b4204e9b6fcb41be5b9040631c2b934c453 100644 (file)
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -50,7 +50,7 @@ M: interactor manifest>>
     ] if ;
 
 : vocab-exists? ( name -- ? )
-    '[ _ { [ vocab ] [ find-vocab-root ] } 1|| ] [ drop f ] recover ;
+    '[ _ { [ lookup-vocab ] [ find-vocab-root ] } 1|| ] [ drop f ] recover ;
 
 GENERIC: (word-at-caret) ( token completion-mode -- obj )
 

diff --git a/basis/ui/tools/profiler/profiler.factor b/basis/ui/tools/profiler/profiler.factor
index fe27ec2b4a3680b9195f22be779e02c31417d4d7..48ead0cb34de174d06dabfa9bd0cbea252c96e6d 100644 (file)
--- a/basis/ui/tools/profiler/profiler.factor
+++ b/basis/ui/tools/profiler/profiler.factor
@@ -95,7 +95,7 @@ M: method-renderer column-titles drop { "" "Method" "Count" } ;
     [ <model> ] dip <profiler-model> [ f prefix ] <arrow> ;
 
 : <vocabs-model> ( profiler -- model )
-    [ vocab-counters [ [ vocab ] dip ] assoc-map ] dip
+    [ vocab-counters [ [ lookup-vocab ] dip ] assoc-map ] dip
     <profiler-filter-model> ;
 
 : <generic-model> ( profiler -- model )

diff --git a/basis/vocabs/errors/errors.factor b/basis/vocabs/errors/errors.factor
index 8f88eb381636223b1125d938485ec0cb08694b19..454ed52b3038e96d7a05dc3198d06bf2bb6b972b 100644 (file)
--- a/basis/vocabs/errors/errors.factor
+++ b/basis/vocabs/errors/errors.factor
@@ -9,7 +9,7 @@ IN: vocabs.errors
 : vocab-heading. ( vocab -- )
     nl
     "==== " write
-    [ vocab-name ] [ vocab write-object ] bi ":" print
+    [ vocab-name ] [ lookup-vocab write-object ] bi ":" print
     nl ;
 
 : load-error. ( triple -- )
@@ -32,4 +32,4 @@ PRIVATE>
             recover
         ] each
         failures get
-    ] with-scope ;
\ No newline at end of file
+    ] with-scope ;

diff --git a/basis/vocabs/files/files-tests.factor b/basis/vocabs/files/files-tests.factor
index a12a9c957f4dd0bed3cc374d06394d9a2212898c..aed1ab5a7779745500e7f7183813a3bcd0867814 100644 (file)
--- a/basis/vocabs/files/files-tests.factor
+++ b/basis/vocabs/files/files-tests.factor
@@ -3,7 +3,7 @@ USING: tools.test vocabs.files vocabs arrays grouping ;
 
 [ t ] [
     "kernel" vocab-files
-    "kernel" vocab vocab-files
+    "kernel" lookup-vocab vocab-files
     "kernel" <vocab-link> vocab-files
     3array all-equal?
-] unit-test
\ No newline at end of file
+] unit-test

diff --git a/basis/vocabs/generated/generated.factor b/basis/vocabs/generated/generated.factor
index cb1f847ece1e713cd45e384d1796d0bc5810379a..37f7cf247af3072b360f9be1e234fc2bca1233a0 100644 (file)
--- a/basis/vocabs/generated/generated.factor
+++ b/basis/vocabs/generated/generated.factor
@@ -4,7 +4,7 @@ USING: compiler.units continuations fry kernel vocabs vocabs.parser ;
 IN: vocabs.generated
 
 : generate-vocab ( vocab-name quot -- vocab )
-    [ dup vocab [ ] ] dip '[
+    [ dup lookup-vocab [ ] ] dip '[
         [
             [
                 [ _ with-current-vocab ] [ ] [ forget-vocab ] cleanup

diff --git a/basis/vocabs/hierarchy/hierarchy.factor b/basis/vocabs/hierarchy/hierarchy.factor
index d3436d7dba6525d5d79325b94f3bafce21d702e3..48d9591ecc7e8b76731d8d3e3fbbd21e2bdf47bf 100644 (file)
--- a/basis/vocabs/hierarchy/hierarchy.factor
+++ b/basis/vocabs/hierarchy/hierarchy.factor
@@ -87,7 +87,7 @@ PRIVATE>
 \r
 : child-vocabs ( prefix -- assoc )\r
     [ [ vocab-roots get ] dip '[ dup _ (child-vocabs) ] { } map>assoc ]\r
-    [ unrooted-child-vocabs [ vocab ] map f swap 2array ]\r
+    [ unrooted-child-vocabs [ lookup-vocab ] map f swap 2array ]\r
     bi suffix ;\r
 \r
 : all-vocabs ( -- assoc )\r
@@ -95,7 +95,7 @@ PRIVATE>
 \r
 : child-vocabs-recursive ( prefix -- assoc )\r
     [ [ vocab-roots get ] dip '[ dup _ (child-vocabs-recursive) ] { } map>assoc ]\r
-    [ unrooted-child-vocabs-recursive [ vocab ] map f swap 2array ]\r
+    [ unrooted-child-vocabs-recursive [ lookup-vocab ] map f swap 2array ]\r
     bi suffix ;\r
 \r
 MEMO: all-vocabs-recursive ( -- assoc )\r

diff --git a/basis/vocabs/prettyprint/prettyprint.factor b/basis/vocabs/prettyprint/prettyprint.factor
index 2cdec0d382eb35f66d5ba20b2f3f5fcca541d265..bca011227ff3547e0ccc1fa7cc02d6665a5cea4c 100644 (file)
--- a/basis/vocabs/prettyprint/prettyprint.factor
+++ b/basis/vocabs/prettyprint/prettyprint.factor
@@ -8,7 +8,7 @@ FROM: io.styles => inset ;
 IN: vocabs.prettyprint
 
 : pprint-vocab ( vocab -- )
-    [ vocab-name ] [ vocab vocab-style ] bi styled-text ;
+    [ vocab-name ] [ lookup-vocab vocab-style ] bi styled-text ;
 
 : pprint-in ( vocab -- )
     [ \ IN: pprint-word pprint-vocab ] with-pprint ;
@@ -19,7 +19,7 @@ IN: vocabs.prettyprint
     [ vocab-name ] sort-with ;
 
 : pprint-using ( seq -- )
-    [ "syntax" vocab = not ] filter
+    [ "syntax" lookup-vocab = not ] filter
     sort-vocabs [
         \ USING: pprint-word
         [ pprint-vocab ] each
@@ -96,4 +96,4 @@ PRIVATE>
         { inset { 5 5 } }
     } [ manifest get pprint-manifest ] with-nesting
     nl nl
-] print-use-hook set-global
\ No newline at end of file
+] print-use-hook set-global

diff --git a/basis/vocabs/refresh/refresh.factor b/basis/vocabs/refresh/refresh.factor
index 3d9c91bbcd52beeead288bf03bc8f7651a41f8c6..bff3781e5a9273ebfcb9e661cde4e5048e6fe2a8 100644 (file)
--- a/basis/vocabs/refresh/refresh.factor
+++ b/basis/vocabs/refresh/refresh.factor
@@ -22,7 +22,7 @@ IN: vocabs.refresh
 SYMBOL: changed-vocabs
 
 : changed-vocab ( vocab -- )
-    dup vocab changed-vocabs get and
+    dup lookup-vocab changed-vocabs get and
     [ dup changed-vocabs get set-at ] [ drop ] if ;
 
 : unchanged-vocab ( vocab -- )
@@ -58,12 +58,12 @@ SYMBOL: modified-docs
             [
                 [
                     [ modified-sources ]
-                    [ vocab source-loaded?>> ]
+                    [ lookup-vocab source-loaded?>> ]
                     [ vocab-source-path ]
                     tri (to-refresh)
                 ] [
                     [ modified-docs ]
-                    [ vocab docs-loaded?>> ]
+                    [ lookup-vocab docs-loaded?>> ]
                     [ vocab-docs-path ]
                     tri (to-refresh)
                 ] bi
@@ -78,8 +78,8 @@ SYMBOL: modified-docs
 : do-refresh ( modified-sources modified-docs unchanged -- )
     unchanged-vocabs
     [
-        [ [ vocab f >>source-loaded? drop ] each ]
-        [ [ vocab f >>docs-loaded? drop ] each ] bi*
+        [ [ lookup-vocab f >>source-loaded? drop ] each ]
+        [ [ lookup-vocab f >>docs-loaded? drop ] each ] bi*
     ]
     [
         union

diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index eff14b2f962b4201e62b43547fb46cc02dd3eceb..55b134abacc09114491f35113959e7f79479938b 100755 (executable)
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -32,7 +32,7 @@ architecture get {
 ! Now we have ( syntax-quot arch-quot layouts-quot ) on the stack
 
 ! Bring up a bare cross-compiling vocabulary.
-"syntax" vocab vocab-words bootstrap-syntax set
+"syntax" lookup-vocab vocab-words bootstrap-syntax set
 
 H{ } clone dictionary set
 H{ } clone root-cache set

diff --git a/core/compiler/units/units.factor b/core/compiler/units/units.factor
index ffbdbefbf2806a4b9dfd64d318603fb68ca73699..ea362f3cb5bf86893c079dfd930a26646cf5d7dd 100644 (file)
--- a/core/compiler/units/units.factor
+++ b/core/compiler/units/units.factor
@@ -116,7 +116,7 @@ M: object always-bump-effect-counter? drop f ;
 
 : changed-vocabs ( assoc -- vocabs )
     [ drop word? ] assoc-filter
-    [ drop vocabulary>> dup [ vocab ] when dup ] assoc-map ;
+    [ drop vocabulary>> dup [ lookup-vocab ] when dup ] assoc-map ;
 
 : updated-definitions ( -- assoc )
     H{ } clone

diff --git a/core/vocabs/loader/loader-tests.factor b/core/vocabs/loader/loader-tests.factor
index 89afb50af7b15bd83ef9e567e2783b3318752520..d5fbacf5f1f45103803e45b8ca9e8ed6713de127 100644 (file)
--- a/core/vocabs/loader/loader-tests.factor
+++ b/core/vocabs/loader/loader-tests.factor
@@ -16,7 +16,7 @@ IN: vocabs.loader.tests
 [ "vocabs.loader.test" >vocab-link ] unit-test
 
 [ t ]
-[ "kernel" >vocab-link "kernel" vocab = ] unit-test
+[ "kernel" >vocab-link "kernel" lookup-vocab = ] unit-test
 
 IN: vocabs.loader.test.2
 
@@ -28,7 +28,7 @@ IN: vocabs.loader.tests
 
 [ ] [
     "vocabs.loader.test.2" run
-    "vocabs.loader.test.2" vocab run
+    "vocabs.loader.test.2" lookup-vocab run
     "vocabs.loader.test.2" <vocab-link> run
 ] unit-test
 
@@ -42,7 +42,7 @@ IN: vocabs.loader.tests
 2 [
     [ "vocabs.loader.test.a" require ] must-fail
     
-    [ f ] [ "vocabs.loader.test.a" vocab source-loaded?>> ] unit-test
+    [ f ] [ "vocabs.loader.test.a" lookup-vocab source-loaded?>> ] unit-test
     
     [ t ] [
         "resource:core/vocabs/loader/test/a/a.factor"
@@ -111,7 +111,7 @@ IN: vocabs.loader.tests
 [ "kernel" <vocab-link> where ] unit-test
 
 [ { "resource:core/kernel/kernel.factor" 1 } ]
-[ "kernel" vocab where ] unit-test
+[ "kernel" lookup-vocab where ] unit-test
 
 [ ] [
     [
@@ -122,7 +122,7 @@ IN: vocabs.loader.tests
 
 [ +done+ ] [
     [ "vocabs.loader.test.d" require ] [ :1 ] recover
-    "vocabs.loader.test.d" vocab source-loaded?>>
+    "vocabs.loader.test.d" lookup-vocab source-loaded?>>
 ] unit-test
 
 : forget-junk ( -- )
@@ -172,18 +172,18 @@ forget-junk
 [ ] [ [ "vocabs.loader.test.j" require ] [ drop :1 ] recover ] unit-test
 
 [ ] [ "vocabs.loader.test.m" require ] unit-test
-[ f ] [ "vocabs.loader.test.n" vocab ] unit-test
+[ f ] [ "vocabs.loader.test.n" lookup-vocab ] unit-test
 [ ] [ "vocabs.loader.test.o" require ] unit-test
-[ t ] [ "vocabs.loader.test.n" vocab >boolean ] unit-test
+[ t ] [ "vocabs.loader.test.n" lookup-vocab >boolean ] unit-test
 
 [
     "mno" [ "vocabs.loader.test." swap suffix forget-vocab ] each
 ] with-compilation-unit
 
 [ ] [ "vocabs.loader.test.o" require ] unit-test
-[ f ] [ "vocabs.loader.test.n" vocab ] unit-test
+[ f ] [ "vocabs.loader.test.n" lookup-vocab ] unit-test
 [ ] [ "vocabs.loader.test.m" require ] unit-test
-[ t ] [ "vocabs.loader.test.n" vocab >boolean ] unit-test
+[ t ] [ "vocabs.loader.test.n" lookup-vocab >boolean ] unit-test
 
 [
     "mno" [ "vocabs.loader.test." swap suffix forget-vocab ] each

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index c0995205e4286c4d2fa7bf7a8fa7436f91869179..8f0974132e6e216ff7f88da4e9bd8370c1419bd9 100644 (file)
--- a/core/vocabs/loader/loader.factor
+++ b/core/vocabs/loader/loader.factor
@@ -88,7 +88,7 @@ require-when-table [ V{ } clone ] initialize
 : load-conditional-requires ( vocab -- )
     vocab-name require-when-vocabs get in? [
         require-when-table get [
-            [ [ vocab dup [ source-loaded?>> +done+ = ] when ] all? ] dip
+            [ [ lookup-vocab dup [ source-loaded?>> +done+ = ] when ] all? ] dip
             [ require ] curry when
         ] assoc-each
     ] when ;
@@ -119,7 +119,7 @@ PRIVATE>
     load-vocab drop ;
 
 : require-when ( if then -- )
-    over [ vocab ] all? [
+    over [ lookup-vocab ] all? [
         require drop
     ] [
         [ drop [ require-when-vocabs get adjoin ] each ]
@@ -127,7 +127,7 @@ PRIVATE>
     ] if ;
 
 : reload ( name -- )
-    dup vocab
+    dup lookup-vocab
     [ [ load-source ] [ load-docs ] bi ]
     [ require ]
     ?if ;
@@ -168,7 +168,7 @@ PRIVATE>
 [
     dup vocab-name blacklist get at* [ rethrow ] [
         drop dup find-vocab-root
-        [ (load-vocab) ] [ dup vocab [ ] [ no-vocab ] ?if ] if
+        [ (load-vocab) ] [ dup lookup-vocab [ ] [ no-vocab ] ?if ] if
     ] if
 ] load-vocab-hook set-global
 

diff --git a/core/vocabs/parser/parser.factor b/core/vocabs/parser/parser.factor
index 8d1d2664dabf043aae84224e0ebc34a584c1dc64..0259482686c5ceac799ff9930b8a15ceba5f0e59 100644 (file)
--- a/core/vocabs/parser/parser.factor
+++ b/core/vocabs/parser/parser.factor
@@ -221,17 +221,17 @@ M: extra-words update trim-forgotten ;
 M: exclude update trim-forgotten ;
 
 M: qualified update
-    dup vocab>> vocab [
+    dup vocab>> lookup-vocab [
         dup [ prefix>> ] [ vocab>> load-vocab ] bi qualified-words
         >>words
     ] [ drop f ] if ;
 
-M: vocab update dup name>> vocab eq? ;
+M: vocab update dup name>> lookup-vocab eq? ;
 
 : update-manifest ( manifest -- )
-    [ dup [ name>> vocab ] when ] change-current-vocab
-    [ [ drop vocab ] assoc-filter ] change-search-vocab-names
-    dup search-vocab-names>> keys [ vocab ] V{ } map-as >>search-vocabs
+    [ dup [ name>> lookup-vocab ] when ] change-current-vocab
+    [ [ drop lookup-vocab ] assoc-filter ] change-search-vocab-names
+    dup search-vocab-names>> keys [ lookup-vocab ] V{ } map-as >>search-vocabs
     qualified-vocabs>> [ update ] filter! drop ;
 
 M: manifest definitions-changed ( assoc manifest -- )

diff --git a/core/vocabs/vocabs-docs.factor b/core/vocabs/vocabs-docs.factor
index da40fdc3b9b998a12366ef1493ae763994466747..c67cdb450856b317319ee6c223260047849c7449 100644 (file)
--- a/core/vocabs/vocabs-docs.factor
+++ b/core/vocabs/vocabs-docs.factor
@@ -26,7 +26,7 @@ $nl
 }
 "Looking up existing vocabularies and creating new vocabularies:"
 { $subsections
-    vocab
+    lookup-vocab
     child-vocabs
     create-vocab
 }
@@ -50,7 +50,7 @@ HELP: vocabs
 { $values { "seq" "a sequence of strings" } }
 { $description "Outputs a sequence of all defined vocabulary names." } ;
 
-HELP: vocab
+HELP: lookup-vocab
 { $values { "vocab-spec" "a vocabulary specifier" } { "vocab" vocab } }
 { $description "Outputs a named vocabulary, or " { $link f } " if no vocabulary with this name exists." }
 { $class-description "Instances represent vocabularies." } ;

diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index 38881673e9877986398c0ca50684a627bca83a78..1b7a84b03d05912984e16a33d917c71f48227c31 100644 (file)
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -35,17 +35,17 @@ M: vocab-link vocab-name name>> ;
 
 M: string vocab-name ;
 
-GENERIC: vocab ( vocab-spec -- vocab )
+GENERIC: lookup-vocab ( vocab-spec -- vocab )
 
-M: vocab vocab ;
+M: vocab lookup-vocab ;
 
-M: object vocab ( name -- vocab ) vocab-name dictionary get at ;
+M: object lookup-vocab ( name -- vocab ) vocab-name dictionary get at ;
 
 GENERIC: vocab-words ( vocab-spec -- words )
 
 M: vocab vocab-words words>> ;
 
-M: object vocab-words vocab vocab-words ;
+M: object vocab-words lookup-vocab vocab-words ;
 
 M: f vocab-words ;
 
@@ -53,7 +53,7 @@ GENERIC: vocab-help ( vocab-spec -- help )
 
 M: vocab vocab-help help>> ;
 
-M: object vocab-help vocab vocab-help ;
+M: object vocab-help lookup-vocab vocab-help ;
 
 M: f vocab-help ;
 
@@ -61,7 +61,7 @@ GENERIC: vocab-main ( vocab-spec -- main )
 
 M: vocab vocab-main main>> ;
 
-M: object vocab-main vocab vocab-main ;
+M: object vocab-main lookup-vocab vocab-main ;
 
 M: f vocab-main ;
 
@@ -115,7 +115,7 @@ GENERIC: >vocab-link ( name -- vocab )
 
 M: vocab-spec >vocab-link ;
 
-M: string >vocab-link dup vocab [ ] [ <vocab-link> ] ?if ;
+M: string >vocab-link dup lookup-vocab [ ] [ <vocab-link> ] ?if ;
 
 : forget-vocab ( vocab -- )
     [ words forget-all ]