From 87433a4585d34d413dbf5b042446bb44bc8488f2 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Tue, 5 Aug 2014 10:30:07 -0700
Subject: [PATCH] ``swap drop`` is ``nip``.

---
 basis/formatting/formatting.factor    | 2 +-
 basis/game/input/xinput/xinput.factor | 6 +++---
 extra/images/tga/tga.factor           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/basis/formatting/formatting.factor b/basis/formatting/formatting.factor
index 00e4041924..1aedd07afb 100644
--- a/basis/formatting/formatting.factor
+++ b/basis/formatting/formatting.factor
@@ -20,7 +20,7 @@ IN: formatting
             {
                { CHAR: - [ [ 1 - ] dip remove-nth "-" prepend ] }
                { CHAR: + [ [ 1 - ] dip remove-nth "+" prepend ] }
-               [ drop swap drop ]
+               [ drop nip ]
             } case
          ] [ drop ] if
       ] when ;
diff --git a/basis/game/input/xinput/xinput.factor b/basis/game/input/xinput/xinput.factor
index 70b5e14fa2..c51ec1e098 100644
--- a/basis/game/input/xinput/xinput.factor
+++ b/basis/game/input/xinput/xinput.factor
@@ -17,7 +17,7 @@ xinput-game-input-backend game-input-backend set-global
     65535 * >fixnum 0 65535 clamp ; inline
 MACRO: map-index-compose ( seq quot -- seq )
     '[ '[ _ execute _ ] _ compose ] map-index 1quotation ;
-    
+
 : fill-buttons ( button-bitmap -- button-array )
     10 0.0 <array> dup rot >fixnum
     { XINPUT_GAMEPAD_START
@@ -114,8 +114,8 @@ M: xinput-game-input-backend instance-id
     if ;
 
 M: xinput-game-input-backend read-controller
-    XINPUT_STATE <struct> [ XInputGetState ] keep
-    swap drop fill-controller-state ;
+    XINPUT_STATE <struct> [ XInputGetState drop ] keep
+    fill-controller-state ;
 
 M: xinput-game-input-backend calibrate-controller drop ;
 
diff --git a/extra/images/tga/tga.factor b/extra/images/tga/tga.factor
index debf66d0f3..c64f4907d8 100644
--- a/extra/images/tga/tga.factor
+++ b/extra/images/tga/tga.factor
@@ -58,7 +58,7 @@ ERROR: bad-tga-unsupported ;
     read ; inline
 
 : read-color-map ( type length elt-size -- color-map )
-    pick 1 = [ 8 align 8 / * read ] [ 2drop f ] if swap drop ; inline
+    pick 1 = [ 8 align 8 / * read ] [ 2drop f ] if nip ; inline
 
 : read-image-data ( width height depth -- image-data )
     8 align 8 / * * read ; inline