From: John Benediktsson Date: Sun, 30 Nov 2014 16:38:59 +0000 (-0800) Subject: cleanup "over push" is "suffix!". X-Git-Tag: unmaintained~3194 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=818f337b027d0bc3c3e20505f3ab54e507e814c4 cleanup "over push" is "suffix!". --- diff --git a/basis/base64/base64.factor b/basis/base64/base64.factor index 0f25a812be..ad95b6a6c5 100644 --- a/basis/base64/base64.factor +++ b/basis/base64/base64.factor @@ -14,7 +14,7 @@ ERROR: malformed-base64 ; [ drop read1-ignoring ] [ 2nip ] if ; inline recursive : push-ignoring ( accum ch -- accum ) - dup { f 0 } member-eq? [ drop ] [ over push ] if ; inline + dup { f 0 } member-eq? [ drop ] [ suffix! ] if ; inline : read-ignoring ( n ignoring stream -- str/f ) [ [ ] keep ] 2dip diff --git a/basis/math/matrices/matrices.factor b/basis/math/matrices/matrices.factor index 58e205fcfd..d1894108c0 100644 --- a/basis/math/matrices/matrices.factor +++ b/basis/math/matrices/matrices.factor @@ -162,7 +162,7 @@ IN: math.matrices [ dupd proj v- ] each ; : gram-schmidt ( seq -- orthogonal ) - V{ } clone [ over (gram-schmidt) over push ] reduce ; + V{ } clone [ over (gram-schmidt) suffix! ] reduce ; : norm-gram-schmidt ( seq -- orthonormal ) gram-schmidt [ normalize ] map ; diff --git a/basis/specialized-vectors/specialized-vectors-tests.factor b/basis/specialized-vectors/specialized-vectors-tests.factor index 1519ad415e..4522fd0599 100644 --- a/basis/specialized-vectors/specialized-vectors-tests.factor +++ b/basis/specialized-vectors/specialized-vectors-tests.factor @@ -4,6 +4,6 @@ tools.test kernel sequences alien.c-types ; SPECIALIZED-ARRAY: float SPECIALIZED-VECTORS: float double ; -[ 3 ] [ double-vector{ 1 2 } 3 over push length ] unit-test +[ 3 ] [ double-vector{ 1 2 } 3 suffix! length ] unit-test -[ t ] [ 10 float-array{ } new-resizable float-vector? ] unit-test \ No newline at end of file +[ t ] [ 10 float-array{ } new-resizable float-vector? ] unit-test diff --git a/basis/splitting/monotonic/monotonic.factor b/basis/splitting/monotonic/monotonic.factor index 6c7f3463a5..232c02a54e 100644 --- a/basis/splitting/monotonic/monotonic.factor +++ b/basis/splitting/monotonic/monotonic.factor @@ -9,9 +9,9 @@ IN: splitting.monotonic : (monotonic-split) ( seq quot -- newseq ) [ V{ } clone V{ } clone ] 2dip [ ] swap '[ - [ [ over push ] keep ] dip - [ @ [ over push V{ } clone ] unless ] keep - ] map-reduce over push over push { } like ; inline + [ [ suffix! ] keep ] dip + [ @ [ suffix! V{ } clone ] unless ] keep + ] map-reduce suffix! suffix! { } like ; inline PRIVATE> diff --git a/basis/vlists/vlists-tests.factor b/basis/vlists/vlists-tests.factor index 6df942eb84..0bf0d95c49 100644 --- a/basis/vlists/vlists-tests.factor +++ b/basis/vlists/vlists-tests.factor @@ -20,7 +20,7 @@ IN: vlists.tests dup "v" get [ vector>> ] bi@ eq? ] unit-test -[ VL{ } 3 over push ] must-fail +[ VL{ } 3 suffix! ] must-fail [ 4 VL{ "hi" } set-first ] must-fail diff --git a/core/byte-vectors/byte-vectors-tests.factor b/core/byte-vectors/byte-vectors-tests.factor index 286b7c419e..6638b9df7a 100644 --- a/core/byte-vectors/byte-vectors-tests.factor +++ b/core/byte-vectors/byte-vectors-tests.factor @@ -5,7 +5,7 @@ IN: byte-vectors.tests [ 0 ] [ 123 length ] unit-test : do-it ( seq -- seq ) - 123 [ over push ] each-integer ; + 123 [ suffix! ] each-integer ; [ t ] [ 3 do-it diff --git a/extra/benchmark/reverse-complement/reverse-complement.factor b/extra/benchmark/reverse-complement/reverse-complement.factor index 5fb34065c5..b6bddd3060 100644 --- a/extra/benchmark/reverse-complement/reverse-complement.factor +++ b/extra/benchmark/reverse-complement/reverse-complement.factor @@ -16,7 +16,7 @@ TR: trans-map ch>upper "ACGTUMRYKVHDB" "TGCAAKYRMBDHV" ; : do-line ( seq line -- seq ) dup first ">;" member-eq? - [ over show-seq print dup delete-all ] [ over push ] if ; + [ over show-seq print dup delete-all ] [ suffix! ] if ; HINTS: do-line vector string ; diff --git a/extra/jamshred/jamshred.factor b/extra/jamshred/jamshred.factor index ce53fefcf5..fc4457980d 100644 --- a/extra/jamshred/jamshred.factor +++ b/extra/jamshred/jamshred.factor @@ -26,7 +26,7 @@ M: jamshred-gadget draw-gadget* ( gadget -- ) ] [ [ jamshred>> jamshred-update ] [ relayout-1 ] - [ 100 milliseconds sleep jamshred-loop ] tri + [ 100 milliseconds sleep jamshred-loop ] tri ] if ; M: jamshred-gadget graft* ( gadget -- ) @@ -57,7 +57,7 @@ M: jamshred-gadget ungraft* ( gadget -- ) : handle-mouse-motion ( jamshred-gadget -- ) hand-loc get [ over last-hand-loc>> [ - v- (handle-mouse-motion) + v- (handle-mouse-motion) ] [ 2drop ] if* ] 2keep >>last-hand-loc drop ; diff --git a/extra/jamshred/tunnel/tunnel.factor b/extra/jamshred/tunnel/tunnel.factor index 7d46eb1e9a..2321bece18 100644 --- a/extra/jamshred/tunnel/tunnel.factor +++ b/extra/jamshred/tunnel/tunnel.factor @@ -32,9 +32,7 @@ CONSTANT: random-rotation-angle $[ pi 20 / ] random-color >>color dup segment-number++ ; : (random-segments) ( segments n -- segments ) - dup 0 > [ - [ dup last random-segment over push ] dip 1 - (random-segments) - ] [ drop ] if ; + [ dup last random-segment suffix! ] times ; CONSTANT: default-segment-radius 1 diff --git a/extra/project-euler/002/002.factor b/extra/project-euler/002/002.factor index 63d6eac8b4..201e4f6743 100644 --- a/extra/project-euler/002/002.factor +++ b/extra/project-euler/002/002.factor @@ -23,7 +23,7 @@ IN: project-euler.002 diff --git a/unmaintained/semantic-db/semantic-db.factor b/unmaintained/semantic-db/semantic-db.factor index 2432dce420..c703869456 100644 --- a/unmaintained/semantic-db/semantic-db.factor +++ b/unmaintained/semantic-db/semantic-db.factor @@ -259,7 +259,7 @@ C: node-tree : (get-node-chain) ( node next-selector seq -- seq ) pick [ - over push >r [ call ] keep r> (get-node-chain) + suffix! >r [ call ] keep r> (get-node-chain) ] [ 2nip ] if* ;