Change "3dup drop" to "2over".

diff --git a/basis/compression/lzw/lzw.factor b/basis/compression/lzw/lzw.factor
index 248700b08ce09ef6f8e8ea7b8b41b0a95ed9c5e8..79a8b02e4e105100bca2703f1bd01dc15331c9e0 100755 (executable)
--- a/basis/compression/lzw/lzw.factor
+++ b/basis/compression/lzw/lzw.factor
@@ -83,8 +83,8 @@ M: gif-lzw increment-code-size [ 1 + 12 min ] change-code-size ;
 DEFER: handle-clear-code
 : lzw-process-next-code ( lzw quot: ( lzw code -- ) -- )
     [ lzw-read ] dip {
-        { [ 3dup drop end-of-information? ] [ 3drop ] }
-        { [ 3dup drop clear-code? ] [ 2drop handle-clear-code ] }
+        { [ 2over end-of-information? ] [ 3drop ] }
+        { [ 2over clear-code? ] [ 2drop handle-clear-code ] }
         [ call( lzw code -- ) ]
     } cond ; inline
 

diff --git a/basis/io/timeouts/timeouts.factor b/basis/io/timeouts/timeouts.factor
index c024e498566a9edf03aa8481eec11505ac008a74..2190b4009d27ed2281fdfde8103add92341be43e 100644 (file)
--- a/basis/io/timeouts/timeouts.factor
+++ b/basis/io/timeouts/timeouts.factor
@@ -17,7 +17,7 @@ GENERIC: cancel-operation ( obj -- )
     [ '[ _ cancel-operation ] ] dip later ;\r
 \r
 : with-timeout* ( obj timeout quot -- )\r
-    3dup drop queue-timeout [ nip call ] dip stop-timer ;\r
+    2over queue-timeout [ nip call ] dip stop-timer ;\r
     inline\r
 \r
 : with-timeout ( obj quot -- )\r

diff --git a/basis/persistent/heaps/heaps.factor b/basis/persistent/heaps/heaps.factor
index 38a7eb1313a370a24441d9db2a9e9b804683992d..e836a4afc6c746e692a54ef6ed8444cbd896c8bb 100644 (file)
--- a/basis/persistent/heaps/heaps.factor
+++ b/basis/persistent/heaps/heaps.factor
@@ -37,7 +37,7 @@ PRIVATE>
 GENERIC: sift-down ( value prio left right -- heap )
 
 : singleton-sift-down ( value prio singleton empty -- heap )
-    3dup drop prio>> <= [ <branch> ] [
+    2over prio>> <= [ <branch> ] [
         drop -rot [ [ value>> ] [ prio>> ] bi ] 2dip
         <singleton-heap> <persistent-heap> <branch>
     ] if ;

diff --git a/basis/regexp/dfa/dfa.factor b/basis/regexp/dfa/dfa.factor
index 235ff5148f6b6603d6475b5666f29a99a8647640..8ded517c2abcf0ee574dd9afa38816b056e4d163 100644 (file)
--- a/basis/regexp/dfa/dfa.factor
+++ b/basis/regexp/dfa/dfa.factor
@@ -43,7 +43,7 @@ IN: regexp.dfa
     [ tagged-epsilon? not ] filter ;
 
 : add-todo-state ( state visited-states new-states -- )
-    3dup drop key? [ 3drop ] [
+    2over key? [ 3drop ] [
         [ conjoin ] [ push ] bi-curry* bi
     ] if ;
 

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 75a8f6cbe19231686cc75b3ecab4ce4accfe1f94..e57ecc631ffcf8b41f460471b5fbf13e313fcca8 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -272,7 +272,7 @@ IN: tools.deploy.shaker
         _ _
         {
             ! old becomes new
-            { [ 3dup drop eq? ] [ 2nip ] }
+            { [ 2over eq? ] [ 2nip ] }
             ! recurse into arrays
             { [ pick array? ] [ [ dup ] 2dip recursive-subst ] }
             ! otherwise do nothing

diff --git a/core/sets/sets.factor b/core/sets/sets.factor
index 54a286041633fe5ef35a24d3b50b4eac832b2a82..93d880c64262e274eb61984b6898c8d4f3e51a1d 100644 (file)
--- a/core/sets/sets.factor
+++ b/core/sets/sets.factor
@@ -91,7 +91,7 @@ M: set all-unique? drop t ;
 <PRIVATE
 
 : (pruned) ( elt hash vec -- )
-    3dup drop in? [ 3drop ] [
+    2over in? [ 3drop ] [
         [ drop adjoin ] [ nip push ] 3bi
     ] if ; inline
 

diff --git a/extra/sudoku/sudoku.factor b/extra/sudoku/sudoku.factor
index 848d647fe0561a91aac8d4453cde14bb4737f671..43ca1e9511cff6e14ff74b45ac37b142df99ed9f 100644 (file)
--- a/extra/sudoku/sudoku.factor
+++ b/extra/sudoku/sudoku.factor
@@ -30,7 +30,7 @@ DEFER: search
 : attempt ( n x y -- )
     {
         { [ 3dup nip row-any? ] [ 3drop ] }
-        { [ 3dup drop col-any? ] [ 3drop ] }
+        { [ 2over col-any? ] [ 3drop ] }
         { [ 3dup box-any? ] [ 3drop ] }
         [ assume ]
     } cond ;