Some more general fixes for recent refactors.

diff --git a/basis/compiler/tests/redefine17.factor b/basis/compiler/tests/redefine17.factor
index 5a1c33ad27849ddfdb0a3677b2001665672c8a99..254f54a50aea62a32e9cff7d8dc507fe5dc8fbdc 100644 (file)
--- a/basis/compiler/tests/redefine17.factor
+++ b/basis/compiler/tests/redefine17.factor
@@ -2,7 +2,7 @@ USING: tools.test classes.mixin compiler.units arrays kernel.private
 strings sequences vocabs definitions kernel ;
 IN: compiler.tests.redefine17
 
-<< "compiler.tests.redefine17" words forget-all >>
+<< "compiler.tests.redefine17" vocab-words forget-all >>
 
 GENERIC: bong ( a -- b )
 

diff --git a/basis/listener/listener-tests.factor b/basis/listener/listener-tests.factor
index 4a97996637831e1efb0efde4f7ff1d33e277b41a..476b1a3343ca373dfb26f882c48b726aff09a506 100644 (file)
--- a/basis/listener/listener-tests.factor
+++ b/basis/listener/listener-tests.factor
@@ -53,7 +53,7 @@ SYNTAX: hello "Hi" print ;
     ] unit-test
 ] with-file-vocabs
 
-[ "call" "scratchpad" create drop ] with-compilation-unit
+[ "call" "scratchpad" create-word drop ] with-compilation-unit
 
 [
     [ t ]

diff --git a/basis/tools/disassembler/disassembler-tests.factor b/basis/tools/disassembler/disassembler-tests.factor
index 89ca265bf6ff3ca7d5d4ab930cc5e2cddbbcab1a..a762e36d3f7ee2ab7b2d0d855c13dee7b7e136df 100644 (file)
--- a/basis/tools/disassembler/disassembler-tests.factor
+++ b/basis/tools/disassembler/disassembler-tests.factor
@@ -1,4 +1,6 @@
 IN: tools.disassembler.tests\r
 USING: kernel fry vocabs tools.disassembler tools.test sequences ;\r
 \r
-"math" words [ [ [ ] ] dip '[ _ disassemble ] unit-test ] each
\ No newline at end of file
+"math" vocab-words [\r
+    [ { } ] dip '[ _ disassemble ] unit-test\r
+] each\r

diff --git a/extra/graphviz/render/render.factor b/extra/graphviz/render/render.factor
index 90242a63a15ccd72a190852267c38cc60da52833..5b5c188d9b91317a91e892a49dce2a0ae9d9a358 100644 (file)
--- a/extra/graphviz/render/render.factor
+++ b/extra/graphviz/render/render.factor
@@ -176,7 +176,7 @@ CONSTANT: standard-formats {
 }
 
 : define-graphviz-by-layout ( layout -- )
-    [ "graphviz.render" create ]
+    [ "graphviz.render" create-word ]
     [ [ graphviz ] curry ] bi
     ( graph path format -- )
     define-declared ;
@@ -184,7 +184,7 @@ CONSTANT: standard-formats {
 : define-graphviz-by-format ( format -- )
     [
         dup standard-layouts member? [ "-file" append ] when
-        "graphviz.render" create
+        "graphviz.render" create-word
     ]
     [ [ graphviz* ] curry ] bi
     ( graph path -- )

diff --git a/extra/html/elements/elements.factor b/extra/html/elements/elements.factor
index ba10d165a79cf92df65c1608956bdeab044b1658..921f434b31e20c69791f8c2c46912d51396de3a7 100644 (file)
--- a/extra/html/elements/elements.factor
+++ b/extra/html/elements/elements.factor
@@ -21,7 +21,7 @@ CONSTANT: elements-vocab "html.elements"
 : html-word ( name def effect -- )
     #! Define 'word creating' word to allow
     #! dynamically creating words.
-    [ elements-vocab create ] 2dip define-declared ;
+    [ elements-vocab create-word ] 2dip define-declared ;
 
 : <foo> ( str -- <str> ) "<" ">" surround ;
 

diff --git a/extra/llvm/invoker/invoker.factor b/extra/llvm/invoker/invoker.factor
index b49d255968f5e19c63bd20f05fc9c55fe8ee8392..64a2ac98dc17fd6afb179ba1ecb5d99f47626897 100644 (file)
--- a/extra/llvm/invoker/invoker.factor
+++ b/extra/llvm/invoker/invoker.factor
@@ -37,7 +37,7 @@ TUPLE: function name alien return params ;
 
 : install-function ( function -- )
     dup name>> "alien.llvm" create-vocab drop
-    "alien.llvm" create swap
+    "alien.llvm" create-word swap
     [
         dup name>> function-pointer ,
         dup return>> c:lookup-c-type ,

diff --git a/extra/math/dual/dual.factor b/extra/math/dual/dual.factor
index 55789778af26ad7f1dc7eaecf978f44c1bf6a95e..e500ca80965d0f5ed580f0bb275b049ef2898230 100644 (file)
--- a/extra/math/dual/dual.factor
+++ b/extra/math/dual/dual.factor
@@ -72,7 +72,7 @@ MACRO: dual-op ( word -- )
     '[ _ @ @ <dual> ] ;
 
 : define-dual ( word -- )
-    dup name>> "d" prepend "math.dual" create
+    dup name>> "d" prepend "math.dual" create-word
     [ [ stack-effect ] dip set-stack-effect ]
     [ set-dual-help ]
     [ swap '[ _ dual-op ] define ]

diff --git a/extra/smalltalk/classes/classes.factor b/extra/smalltalk/classes/classes.factor
index 633167c4a02803fe62ef5623ab78fec57ee0ed4e..0790cde7d993aefea4c7ae4877675d7d1daec68b 100644 (file)
--- a/extra/smalltalk/classes/classes.factor
+++ b/extra/smalltalk/classes/classes.factor
@@ -8,7 +8,7 @@ SYMBOL: classes
 classes [ H{ } clone ] initialize
 
 : create-class ( class -- class )
-    "smalltalk.classes" create ;
+    "smalltalk.classes" create-word ;
 
 ERROR: no-class name ;
 

diff --git a/extra/smalltalk/selectors/selectors.factor b/extra/smalltalk/selectors/selectors.factor
index 8485430018efd4c0445010fdcdb4a47245592717..b4828bdbb43b6ed028ea0be0fdefb147d02e2435 100644 (file)
--- a/extra/smalltalk/selectors/selectors.factor
+++ b/extra/smalltalk/selectors/selectors.factor
@@ -21,7 +21,7 @@ SYMBOLS: unary binary keyword ;
     } case "receiver" suffix { "result" } <effect> ;
 
 : selector>generic ( selector -- generic )
-    [ "selector-" prepend "smalltalk.selectors" create dup ]
+    [ "selector-" prepend "smalltalk.selectors" create-word dup ]
     [ selector>effect ]
     bi define-simple-generic ;
 

diff --git a/extra/wordtimer/wordtimer.factor b/extra/wordtimer/wordtimer.factor
index 0c0d36a8291740ff8efd3f5d59e4cb7dc4394a43..9100736bda9aa4bb9898bbf71154120a15b8b1e3 100644 (file)
--- a/extra/wordtimer/wordtimer.factor
+++ b/extra/wordtimer/wordtimer.factor
@@ -1,6 +1,6 @@
-USING: kernel sequences namespaces make math assocs words arrays
-tools.annotations vocabs sorting prettyprint io system
-math.statistics accessors tools.time fry ;
+USING: accessors arrays assocs fry io kernel make math
+math.statistics namespaces prettyprint sequences sorting
+tools.annotations tools.time vocabs ;
 FROM: namespaces => change-global ;
 IN: wordtimer
 
@@ -44,10 +44,10 @@ SYMBOL: *calling*
     dup '[ [ _ ] dip (add-timer) ] annotate ;
 
 : add-timers ( vocab -- )
-    words [ add-timer ] each ;
+    vocab-words [ add-timer ] each ;
 
 : reset-vocab ( vocab -- )
-    words [ reset ] each ;
+    vocab-words [ reset ] each ;
 
 : dummy-word ( -- ) ;