pick pick is 2over

diff --git a/extra/benchmark/nsieve/nsieve.factor b/extra/benchmark/nsieve/nsieve.factor
index c567aa8a8f8122b58a8ce70a6f7dbe0ab584a8ce..7cae1e2a9bc15fca2c25c26587a7a9e30d309f4e 100644 (file)
--- a/extra/benchmark/nsieve/nsieve.factor
+++ b/extra/benchmark/nsieve/nsieve.factor
@@ -6,7 +6,7 @@ arrays namespaces io ;
     2dup length >= [
         3drop
     ] [
-        f pick pick set-nth-unsafe >r over + r> clear-flags
+        f 2over set-nth-unsafe >r over + r> clear-flags
     ] if ; inline
 
 : (nsieve) ( count i seq -- count )

diff --git a/extra/benchmark/recursive/recursive.factor b/extra/benchmark/recursive/recursive.factor
index 6e3c201cf000bdb4c4b806a906b3e0834bcca3df..ee66e303ec0a65ada329fbc614653d60179060c3 100755 (executable)
--- a/extra/benchmark/recursive/recursive.factor
+++ b/extra/benchmark/recursive/recursive.factor
@@ -16,7 +16,7 @@ USING: math kernel hints prettyprint io ;
     ] if ;
 
 : tak ( x y z -- t )
-    pick pick swap < [
+    2over swap < [
         [ rot 1- -rot tak ] 3keep
         [ -rot 1- -rot tak ] 3keep
         1- -rot tak

diff --git a/extra/documents/documents.factor b/extra/documents/documents.factor
index a9b696179eff58a31b78115c9421b6f1fc33a44e..34ecce5f8e26c098a883609a10895fddf5b9bf3e 100755 (executable)
--- a/extra/documents/documents.factor
+++ b/extra/documents/documents.factor
@@ -43,7 +43,7 @@ TUPLE: document locs ;
     ] if ;
 
 : each-line ( from to quot -- )
-    pick pick = [
+    2over = [
         3drop
     ] [
         >r [ first ] 2apply 1+ dup <slice> r> each

diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor
index 4f633f5be17862a89873a871bc1e4a9f6c3a19cc..b894c574f3c34b760190db86a668c21cc3f81257 100755 (executable)
--- a/extra/id3/id3.factor
+++ b/extra/id3/id3.factor
@@ -64,7 +64,7 @@ C: <extended-header> extended-header
   } cond ;
 
 : (read-frame) ( id -- frame )
-  read-frame-size read-frame-flags pick pick read-frame-data <frame> ;
+  read-frame-size read-frame-flags 2over read-frame-data <frame> ;
 
 : read-frame ( -- frame/f )
   read-frame-id dup good-frame-id? [ (read-frame) ] [ drop f ] if ;

diff --git a/extra/math/vectors/vectors.factor b/extra/math/vectors/vectors.factor
index 2be9cf7f583210e56a44229bc22b0088e09231d2..51efd33d4580f0811dff080dcef148d9114ac2e2 100755 (executable)
--- a/extra/math/vectors/vectors.factor
+++ b/extra/math/vectors/vectors.factor
@@ -25,7 +25,7 @@ IN: math.vectors
 : normalize ( u -- v ) dup norm v/n ;
 
 : set-axis ( u v axis -- w )
-    dup length [ >r zero? pick pick ? r> swap nth ] 2map 2nip ;
+    dup length [ >r zero? 2over ? r> swap nth ] 2map 2nip ;
 
 HINTS: vneg { float-array } { array } ;
 HINTS: norm-sq { float-array } { array } ;

diff --git a/extra/parser-combinators/parser-combinators.factor b/extra/parser-combinators/parser-combinators.factor
index b7b62b3c2e1719bb0f0861c27b52badf1cbbe3a9..cdf89e1f37f15374bfdbc0ec19d750047b0db11b 100755 (executable)
--- a/extra/parser-combinators/parser-combinators.factor
+++ b/extra/parser-combinators/parser-combinators.factor
@@ -38,7 +38,7 @@ C: <parse-result> parse-result
     [ [ >upper ] 2apply ] when sequence= ;
 
 : string-head? ( str head ignore-case -- ? )
-    pick pick shorter? [
+    2over shorter? [
         3drop f
     ] [
         >r [ length head-slice ] keep r> string=

diff --git a/extra/sudoku/sudoku.factor b/extra/sudoku/sudoku.factor
index f19e53695274dbec38e2bc01333812da6f6797c9..db5fb75617693ae3588020472e6d2e962191e40b 100644 (file)
--- a/extra/sudoku/sudoku.factor
+++ b/extra/sudoku/sudoku.factor
@@ -35,7 +35,7 @@ DEFER: search
         { [ t ] [ assume ] }
     } cond ;
 
-: solve ( x y -- ) 9 [ 1+ pick pick attempt ] each 2drop ;
+: solve ( x y -- ) 9 [ 1+ 2over attempt ] each 2drop ;
 
 : board. ( board -- )
     standard-table-style [

diff --git a/extra/xmode/marker/state/state.factor b/extra/xmode/marker/state/state.factor
index 35e6bbef188c3a1b4d10d07d07811b5842cbc35c..e3e380798f3cfed8e7d77c6863904e30d9e1db41 100755 (executable)
--- a/extra/xmode/marker/state/state.factor
+++ b/extra/xmode/marker/state/state.factor
@@ -26,7 +26,7 @@ SYMBOL: delegate-end-escaped?
     current-rule-set rule-set-keywords ;
 
 : token, ( from to id -- )
-    pick pick = [ 3drop ] [ >r line get subseq r> <token> , ] if ;
+    2over = [ 3drop ] [ >r line get subseq r> <token> , ] if ;
 
 : prev-token, ( id -- )
     >r last-offset get position get r> token,