change some "2drop 2drop" to "4drop".

diff --git a/basis/compiler/cfg/liveness/liveness.factor b/basis/compiler/cfg/liveness/liveness.factor
index 2c6bcdfa476658e920a851c3a03ffa928531ee69..0a09a00d8b8f1681fcffe1c92c7f55a5a643ad0e 100644 (file)
--- a/basis/compiler/cfg/liveness/liveness.factor
+++ b/basis/compiler/cfg/liveness/liveness.factor
@@ -97,7 +97,7 @@ M: vreg-insn lookup-base-pointer* drop f ;
     pick rep-of {
         { tagged-rep [ nip adjoin ] }
         { int-rep [ visit-derived-root ] }
-        [ 2drop 2drop ]
+        [ 4drop ]
     } case ;
 
 : gc-roots ( live-set -- derived-roots gc-roots )

diff --git a/basis/compiler/tests/intrinsics.factor b/basis/compiler/tests/intrinsics.factor
index 5166deb7ff4c7a9fe316525c2aa2fa2fc05dee3d..2db01739b3295dff4b086eeb5e72c390d3dd2fc4 100644 (file)
--- a/basis/compiler/tests/intrinsics.factor
+++ b/basis/compiler/tests/intrinsics.factor
@@ -301,7 +301,7 @@ cell 8 = [
     [ -18446744073709551616 ] [ -1 64 [ fixnum-shift ] compile-call ] unit-test
     [ -18446744073709551616 ] [ -1 [ 64 fixnum-shift ] compile-call ] unit-test
     [ -18446744073709551616 ] [ -1 [ 32 fixnum-shift 32 fixnum-shift ] compile-call ] unit-test
-    
+
     [ 576460752303423488 ] [ -576460752303423488 >fixnum -1 [ fixnum/i ] compile-call ] unit-test
 
     [ 576460752303423488 0 ] [ -576460752303423488 >fixnum -1 [ fixnum/mod ] compile-call ] unit-test
@@ -315,11 +315,11 @@ cell 8 = [
 ERROR: bug-in-fixnum* x y a b ;
 
 [ ] [
-    10000 [ 
+    10000 [
         32 random-bits >fixnum
         32 random-bits >fixnum
         2dup [ fixnum* ] [ compiled-fixnum* ] 2bi 2dup =
-        [ 2drop 2drop ] [ bug-in-fixnum* ] if
+        [ 4drop ] [ bug-in-fixnum* ] if
     ] times
 ] unit-test
 

diff --git a/basis/io/ports/ports.factor b/basis/io/ports/ports.factor
index f4d01472809d661881f7136d42ddcef9bc01cc51..bf8b1b20ffee1d2512082d9cb43ac7c38dd08633 100644 (file)
--- a/basis/io/ports/ports.factor
+++ b/basis/io/ports/ports.factor
@@ -97,7 +97,7 @@ M:: input-port stream-read-unsafe ( n dst port -- count )
             drop read-until-loop
         ] if
     ] [
-        [ 2drop 2drop ] dip
+        [ 4drop ] dip
     ] if ;
 
 M: input-port stream-read-until ( seps port -- str/f sep/f )

diff --git a/basis/math/intervals/intervals.factor b/basis/math/intervals/intervals.factor
index 8249b91f4a40c48cb3cb67e86de577f501b5890a..065c01dfa8ab1c5cd1bfaf31524a9ca1c28002f5 100644 (file)
--- a/basis/math/intervals/intervals.factor
+++ b/basis/math/intervals/intervals.factor
@@ -67,7 +67,7 @@ MEMO: array-capacity-interval ( -- interval )
 
 : compare-endpoints ( p1 p2 quot -- ? )
     [ 2dup [ first ] bi@ 2dup ] dip call [
-        2drop 2drop t
+        4drop t
     ] [
         number= [ [ second ] bi@ not or ] [ 2drop f ] if
     ] if ; inline

diff --git a/basis/math/partial-dispatch/partial-dispatch.factor b/basis/math/partial-dispatch/partial-dispatch.factor
index cb719eb24adfbe3d4717c4953edad7314fdbd664..d360662679d68dfe0337e1b02cdf985f66e6ff69 100644 (file)
--- a/basis/math/partial-dispatch/partial-dispatch.factor
+++ b/basis/math/partial-dispatch/partial-dispatch.factor
@@ -147,7 +147,7 @@ SYMBOL: fast-math-ops
 
 : math-both-known? ( word left right -- ? )
     3dup math-op
-    [ 2drop 2drop t ]
+    [ 4drop t ]
     [ drop math-class-max swap method-for-class >boolean ] if ;
 
 : (derived-ops) ( word assoc -- words )

diff --git a/basis/stack-checker/visitor/dummy/dummy.factor b/basis/stack-checker/visitor/dummy/dummy.factor
index 3011aac10b6e87c32fca68954884f632f71d95bc..5ff00afa14a695e691a2304b78f20de762baf36c 100644 (file)
--- a/basis/stack-checker/visitor/dummy/dummy.factor
+++ b/basis/stack-checker/visitor/dummy/dummy.factor
@@ -8,7 +8,7 @@ M: f #introduce, drop ;
 M: f #call, 3drop ;
 M: f #call-recursive, 3drop ;
 M: f #push, 2drop ;
-M: f #shuffle, 2drop 2drop drop ;
+M: f #shuffle, 4drop drop ;
 M: f #>r, 2drop ;
 M: f #r>, 2drop ;
 M: f #return, drop ;

diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor
index 94d236e60fe5320da82336568d513c3b950dcc70..785f46d13f11bc883fee7b8283f80bd4f83a1a56 100644 (file)
--- a/basis/ui/tools/inspector/inspector.factor
+++ b/basis/ui/tools/inspector/inspector.factor
@@ -111,7 +111,7 @@ M: inspector-gadget focusable-child*
     [ table>> (selected-row) ] tri [
         [ key>> ] [ key-string>> ] bi
         slot-editor-window
-    ] [ 2drop 2drop ] if ;
+    ] [ 4drop ] if ;
 
 : inspector-help ( -- ) "ui-inspector" com-browse ;
 

diff --git a/basis/vocabs/refresh/refresh.factor b/basis/vocabs/refresh/refresh.factor
index 9626ce730c5eb72fe50623c3292c0145a3d2b38a..8276a59fb3750da10bcc4a613f7edfefa3971e5f 100644 (file)
--- a/basis/vocabs/refresh/refresh.factor
+++ b/basis/vocabs/refresh/refresh.factor
@@ -47,7 +47,7 @@ SYMBOL: modified-docs
                 source-modified? [ get push ] [ 2drop ] if
             ] [ 3drop ] if
         ] [ drop get push ] if
-    ] [ 2drop 2drop ] if ;
+    ] [ 4drop ] if ;
 
 : to-refresh ( prefix -- modified-sources modified-docs unchanged )
     [

diff --git a/unmaintained/adsoda/combinators/combinators.factor b/unmaintained/adsoda/combinators/combinators.factor
index d00eebc9763497ba1bced13f7d38161774874bdc..52a5b83c5180e3dc7a2c2d2dc0ac441fb6163c49 100644 (file)
--- a/unmaintained/adsoda/combinators/combinators.factor
+++ b/unmaintained/adsoda/combinators/combinators.factor
@@ -24,17 +24,17 @@ IN: adsoda.combinators
     2dup swap length \r
     {\r
         { [ over 1 = ] [ 3drop columnize ] }\r
-        { [ over 0 = ] [ 2drop 2drop { } ] }\r
-        { [ 2dup < ] [ 2drop [ 1 cut ] dip  \r
-                         [ 1 - among [ append ] with map  ] \r
+        { [ over 0 = ] [ 4drop { } ] }\r
+        { [ 2dup < ] [ 2drop [ 1 cut ] dip\r
+                         [ 1 - among [ append ] with map ]\r
                          [ among append ] 2bi\r
                        ] }\r
         { [ 2dup = ] [ 3drop 1array ] }\r
-        { [ 2dup > ] [ 2drop 2drop {  } ] } \r
+        { [ 2dup > ] [ 4drop { } ] }\r
     } cond\r
 ;\r
 \r
-: concat-nth ( seq1 seq2 -- seq )  \r
+: concat-nth ( seq1 seq2 -- seq )\r
     [ nth append ] curry map-index ;\r
 \r
 : do-cycle   ( array -- array )   dup first suffix ;\r