worddef>list renamed to word-parameter

diff --git a/library/platform/jvm/prettyprint.factor b/library/platform/jvm/prettyprint.factor
index f52245b795617061cef2b0d85db9744989b6a8bb..b9183f02de41185ff669a1b5424641cbda7d9134 100644 (file)
--- a/library/platform/jvm/prettyprint.factor
+++ b/library/platform/jvm/prettyprint.factor
@@ -52,8 +52,8 @@ USE: words
     0 swap
     intern dup worddef
     [
-        [ compound-or-compiled? ] [ worddef>list prettyprint-:; ]
-        [ shuffle? ] [ worddef>list prettyprint-~<<>>~ ]
+        [ compound-or-compiled? ] [ word-parameter prettyprint-:; ]
+        [ shuffle? ] [ word-parameter prettyprint-~<<>>~ ]
         [ primitive? ] [ "PRIMITIVE: " write unparse write drop ]
         [ drop t ] [ 2drop "Not defined" write ]
     ] cond prettyprint-newline ;

diff --git a/library/test/jvm-compiler/miscellaneous.factor b/library/test/jvm-compiler/miscellaneous.factor
index c561e9e59c569552ec0e63efc962772aac874e89..5db045fc956c6dc39a6fa6da102ca7afc6dc041a 100644 (file)
--- a/library/test/jvm-compiler/miscellaneous.factor
+++ b/library/test/jvm-compiler/miscellaneous.factor
@@ -35,10 +35,10 @@ USE: words
 [ f ] [ "#:a" "#:a" ] [ intern-test ] test-word
 [ t ] [ "#:" "#:" ] [ intern-test ] test-word
 
-: worddef>list-test ( -- ? )
-    [ dup * ] dup no-name worddef>list = ;
+: word-parameter-test ( -- ? )
+    [ dup * ] dup no-name word-parameter = ;
 
-[ t           ] [                 ] [ worddef>list-test ] test-word
+[ t           ] [                 ] [ word-parameter-test ] test-word
 
 : words-test ( -- ? )
     t vocabs [ words [ word? and ] each ] each ;
@@ -50,21 +50,21 @@ USE: words
 
 [ [ "A" "r:B" "--" "A" "r:B" ] ]
 [ "test-shuffle-1" ]
-[ worddef>list ]
+[ word-parameter ]
 test-word
 
 ~<< test-shuffle-2 A B -- r:A r:B >>~
 
 [ [ "A" "B" "--" "r:A" "r:B" ] ]
 [ "test-shuffle-2" ]
-[ worddef>list ]
+[ word-parameter ]
 test-word
 
 ~<< test-shuffle-3 A r:B r:C r:D r:E -- A C D E >>~
 
 [ [ "A" "r:B" "r:C" "r:D" "r:E" "--" "A" "C" "D" "E" ] ]
 [ "test-shuffle-3" ]
-[ worddef>list ]
+[ word-parameter ]
 test-word
 
 [ [ 2 1 0 0 ] ] [ [ = ] ] [ balance>list ] test-word
@@ -80,7 +80,7 @@ test-word
 
 : doc-test ( -- ) ;
 
-[ t ] [ "doc-test" ] [ intern worddef>list car comment? ] test-word
+[ t ] [ "doc-test" ] [ intern word-parameter car comment? ] test-word
 
 [ [ 2 1 0 0 ] ] [ [ is ] ] [ balance>list ] test-word
 [ t ] [ "java.lang.Integer" ] [ 0 100 random-int swap is ] test-word

diff --git a/library/test/lists/java.factor b/library/test/lists/java.factor
index 295fde8781127c7cca2111e8717321079adecdf8..a991bde64d0acc1dee14ec14e4a61934e0356e60 100644 (file)
--- a/library/test/lists/java.factor
+++ b/library/test/lists/java.factor
@@ -16,7 +16,7 @@ USE: test
 [ [ 1 1 0 0 ] ] [ [ cdr ] ] [ balance>list ] test-word
 [ [ 1 1 0 0 ] ] [ [ clone-list ] ] [ balance>list ] test-word
 [ [ 2 1 0 0 ] ] [ [ cons ] ] [ balance>list ] test-word
-[ [ 2 1 0 0 ] ] [ [ contains ] ] [ balance>list ] test-word
+[ [ 2 1 0 0 ] ] [ [ contains? ] ] [ balance>list ] test-word
 [ [ 2 0 0 0 ] ] [ [ cons@ ] ] [ balance>list ] test-word
 [ [ 1 1 0 0 ] ] [ [ count ] ] [ balance>list ] do-not-test-word
 [ [ 2 1 0 0 ] ] [ [ nth ] ] [ balance>list ] test-word