From bf891c9634bf780e54d5da465aadb2a67f3b864c Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 23 Oct 2012 12:21:30 -0700 Subject: [PATCH] change some "2drop 2drop" to "4drop". --- basis/compiler/cfg/liveness/liveness.factor | 2 +- basis/compiler/tests/intrinsics.factor | 6 +++--- basis/io/ports/ports.factor | 2 +- basis/math/intervals/intervals.factor | 2 +- basis/math/partial-dispatch/partial-dispatch.factor | 2 +- basis/stack-checker/visitor/dummy/dummy.factor | 2 +- basis/ui/tools/inspector/inspector.factor | 2 +- basis/vocabs/refresh/refresh.factor | 2 +- unmaintained/adsoda/combinators/combinators.factor | 10 +++++----- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/basis/compiler/cfg/liveness/liveness.factor b/basis/compiler/cfg/liveness/liveness.factor index 2c6bcdfa47..0a09a00d8b 100644 --- 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 5166deb7ff..2db01739b3 100644 --- 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 f4d0147280..bf8b1b20ff 100644 --- 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 8249b91f4a..065c01dfa8 100644 --- 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 cb719eb24a..d360662679 100644 --- 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 3011aac10b..5ff00afa14 100644 --- 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 94d236e60f..785f46d13f 100644 --- 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 9626ce730c..8276a59fb3 100644 --- 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 d00eebc976..52a5b83c51 100644 --- a/unmaintained/adsoda/combinators/combinators.factor +++ b/unmaintained/adsoda/combinators/combinators.factor @@ -24,17 +24,17 @@ IN: adsoda.combinators 2dup swap length { { [ over 1 = ] [ 3drop columnize ] } - { [ over 0 = ] [ 2drop 2drop { } ] } - { [ 2dup < ] [ 2drop [ 1 cut ] dip - [ 1 - among [ append ] with map ] + { [ over 0 = ] [ 4drop { } ] } + { [ 2dup < ] [ 2drop [ 1 cut ] dip + [ 1 - among [ append ] with map ] [ among append ] 2bi ] } { [ 2dup = ] [ 3drop 1array ] } - { [ 2dup > ] [ 2drop 2drop { } ] } + { [ 2dup > ] [ 4drop { } ] } } cond ; -: concat-nth ( seq1 seq2 -- seq ) +: concat-nth ( seq1 seq2 -- seq ) [ nth append ] curry map-index ; : do-cycle ( array -- array ) dup first suffix ;