spin: swap rot is spin

diff --git a/basis/csv/csv.factor b/basis/csv/csv.factor
index dc806e2e9b58e86b1934c079c331346fe6860ace..cff7b152d236a3f51d9053fbd14ebcaa517ffe1a 100644 (file)
--- a/basis/csv/csv.factor
+++ b/basis/csv/csv.factor
@@ -40,7 +40,7 @@ DEFER: quoted-field,
     ] if-zero ; inline
 
 : continue-field ( delimiter stream field-seps seq -- sep/f field )
-    swap rot stream-read-until [ "\"" glue ] dip
+    spin stream-read-until [ "\"" glue ] dip
     swap ?trim nipd ; inline
 
 : field ( delimiter stream field-seps quote-seps -- sep/f field )

diff --git a/basis/persistent/hashtables/hashtables.factor b/basis/persistent/hashtables/hashtables.factor
index 28d2d37e09e0a6c49d4836425ef0262747cc0e74..5e46b496a7773ba652bdc3d5fc3d8c12d8bfef25 100644 (file)
--- a/basis/persistent/hashtables/hashtables.factor
+++ b/basis/persistent/hashtables/hashtables.factor
@@ -37,7 +37,7 @@ M: persistent-hash keys >alist keys ;
 M: persistent-hash values >alist values ;
 
 : >persistent-hash ( assoc -- phash )
-    T{ persistent-hash } swap [ swap rot new-at ] assoc-each ;
+    T{ persistent-hash } swap [ spin new-at ] assoc-each ;
 
 M: persistent-hash equal?
     over persistent-hash? [ assoc= ] [ 2drop f ] if ;

diff --git a/basis/toml/toml.factor b/basis/toml/toml.factor
index 6d2caed175ee1bc72ad866d47699223f30aecda9..34a0a6f0f8e5516a6007b8a2378689ade5c07896 100644 (file)
--- a/basis/toml/toml.factor
+++ b/basis/toml/toml.factor
@@ -276,7 +276,7 @@ DEFER: update-toml
 : deep-at ( keys assoc -- value )
     swap [
         over ?at [ nip ] [
-            H{ } clone [ swap rot check-no-key set-at ] keep
+            H{ } clone [ spin check-no-key set-at ] keep
         ] if
     ] each ;
 
@@ -284,11 +284,11 @@ GENERIC: update-toml ( assoc entry -- assoc )
 
 M: entry update-toml
     [ key>> unclip-last [ over deep-at ] dip ] [ value>> ] bi
-    swap rot check-no-key set-at ;
+    spin check-no-key set-at ;
 
 M: table update-toml
     [ name>> unclip-last [ over deep-at ] dip ]
-    [ entries>> [ H{ } clone ] dip [ update-toml ] each swap rot ]
+    [ entries>> [ H{ } clone ] dip [ update-toml ] each spin ]
     [ array?>> [ push-at ] [ check-no-key set-at ] if ] tri ;
 
 PEG: parse-toml ( string -- ast ) toml-parser ;

diff --git a/core/io/streams/sequence/sequence.factor b/core/io/streams/sequence/sequence.factor
index e0e34ec3051704f1a9deb17bbf09ffdd1c6e46b4..bae13f6969af93c1c7f4991fb61b8d66a9611e47 100644 (file)
--- a/core/io/streams/sequence/sequence.factor
+++ b/core/io/streams/sequence/sequence.factor
@@ -24,7 +24,7 @@ SLOT: i
     [
         [ (sequence-read-length) ]
         [ [ dup pick + ] change-i underlying>> ] bi
-    ] dip [ -roll swap rot dupd + seq-copy-loop drop ] 3curry keep ; inline
+    ] dip [ -roll spin dupd + seq-copy-loop drop ] 3curry keep ; inline
 
 : (sequence-read-unsafe) ( n buf stream -- count )
     [ integer>fixnum ]

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index 6c3f91024860c5c2c5145eda9dfbb9b494d544a1..02eaf32819dfc1898f99520570844ef41c1a2327 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -39,7 +39,7 @@ GENERIC#: seq-shorten 1 ( seq n -- seq )
 
 : seq-set-length ( seq n -- seq ) [ swap set-length ] keepd ; inline
 : nth-of ( seq n -- elt ) swap nth ; inline
-: set-nth-of ( seq n elt -- seq ) swap rot [ set-nth ] keep ; inline
+: set-nth-of ( seq n elt -- seq ) spin [ set-nth ] keep ; inline
 
 M: sequence seq-lengthen 2dup lengthd < [ seq-set-length ] [ drop ] if ; inline
 M: sequence seq-shorten 2dup lengthd > [ seq-set-length ] [ drop ] if ; inline

diff --git a/extra/chipmunk/ffi/ffi.factor b/extra/chipmunk/ffi/ffi.factor
index 231795530dc373cf97523c9765a8680f26759761..27ee16b8ce87154cb45f5da16d78a4dd74da9ab8 100644 (file)
--- a/extra/chipmunk/ffi/ffi.factor
+++ b/extra/chipmunk/ffi/ffi.factor
@@ -441,7 +441,7 @@ FUNCTION: int cpPolyShapeGetNumVerts ( cpShape* shape )
 FUNCTION: cpVect cpPolyShapeGetVert ( cpShape* shape, int idx )
 
 TYPED: cpPolyShapeValueOnAxis ( poly: cpPolyShape n: cpVect d -- min-dist )
-    swap rot [ numVerts>> ] [ tVerts>> swap cpVect <c-direct-array> ] bi swap
+    spin [ numVerts>> ] [ tVerts>> swap cpVect <c-direct-array> ] bi swap
     [ cpvdot ] curry [ min ] reduce swap - ; inline
 
 TYPED: cpPolyShapeContainsVert ( poly: cpPolyShape v: cpVect -- ? )

diff --git a/extra/lint/lint.factor b/extra/lint/lint.factor
index b525902d9fc3051c7863be7eb14cf37060656920..e19b6dbfe5080d0841340723636738cd3e635fb4 100644 (file)
--- a/extra/lint/lint.factor
+++ b/extra/lint/lint.factor
@@ -26,6 +26,7 @@ CONSTANT: manual-substitutions
         { 3drop [ drop drop drop ] }
         { pop* [ pop drop ] }
         { when [ [ ] if ] }
+        { spin [ swap rot ] }
         { >boolean [ f = not ] }
     }
 

diff --git a/extra/tokyo/assoc-functor/assoc-functor.factor b/extra/tokyo/assoc-functor/assoc-functor.factor
index e80dbf40022482c477075a14ab3fec9abdef8260..f4d9be9afabe335dd76253e27353d5495e5c0524 100644 (file)
--- a/extra/tokyo/assoc-functor/assoc-functor.factor
+++ b/extra/tokyo/assoc-functor/assoc-functor.factor
@@ -46,7 +46,7 @@ M: TYPE >alist
     [ DBKEYS dup ] keep '[ dup _ at 2array ] map! drop ;
 
 M: TYPE set-at
-    handle>> swap rot [ object>bytes dup length ] bi@ DBPUT drop ;
+    handle>> spin [ object>bytes dup length ] bi@ DBPUT drop ;
 
 M: TYPE delete-at
     handle>> swap object>bytes dup length DBOUT drop ;