From b76503a718d1fca3171f8553821a8568dcc8f108 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Thu, 11 Dec 2014 20:55:04 -0800
Subject: [PATCH] use ">>foo" instead of "over foo<<".

---
 core/growable/growable.factor              |  2 +-
 extra/cpu/8080/emulator/emulator.factor    |  6 +++---
 extra/space-invaders/space-invaders.factor | 14 +++++++-------
 extra/trees/avl/avl.factor                 |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/core/growable/growable.factor b/core/growable/growable.factor
index 65fb3f3b62..fc981d643c 100644
--- a/core/growable/growable.factor
+++ b/core/growable/growable.factor
@@ -53,7 +53,7 @@ M: growable set-length ( n seq -- )
     2dup length >= [
         2dup capacity >= [ over new-size over expand ] when
         [ integer>fixnum ] dip
-        over 1 fixnum+fast over length<<
+        over 1 fixnum+fast >>length
     ] [
         [ integer>fixnum ] dip
     ] if ; inline
diff --git a/extra/cpu/8080/emulator/emulator.factor b/extra/cpu/8080/emulator/emulator.factor
index f79a70c50f..2e0444b399 100644
--- a/extra/cpu/8080/emulator/emulator.factor
+++ b/extra/cpu/8080/emulator/emulator.factor
@@ -518,10 +518,10 @@ ERROR: undefined-8080-opcode n ;
   ] [ 
     [ [ 16667 - ] dip cycles<< ] keep
     dup last-interrupt>> 0x10 = [
-      0x08 over last-interrupt<< 0x08 swap interrupt
+      0x08 >>last-interrupt 0x08 swap interrupt
     ] [
-      0x10 over last-interrupt<< 0x10 swap interrupt
-    ] if     
+      0x10 >>last-interrupt 0x10 swap interrupt
+    ] if
   ] if ;
 
 : peek-instruction ( cpu -- word )
diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor
index 05743aafa7..2e3e9561c5 100755
--- a/extra/space-invaders/space-invaders.factor
+++ b/extra/space-invaders/space-invaders.factor
@@ -86,7 +86,7 @@ CONSTANT: SOUND-UFO-HIT      8
     f swap looping?<< ;
 
 : cpu-init ( cpu -- cpu )
-    make-opengl-bitmap over bitmap<<
+    make-opengl-bitmap >>bitmap
     [ init-sounds ] keep
     [ reset ] keep ;
 
@@ -159,11 +159,11 @@ M: space-invaders read-port ( port cpu -- byte )
     #! Bit 4 = Extended play sound
     over 0 bit? over looping?>> not and [ 
         dup SOUND-UFO play-invaders-sound 
-        t over looping?<<
+        t >>looping?
     ] when 
     over 0 bit? not over looping?>> and [ 
         dup SOUND-UFO stop-invaders-sound 
-        f over looping?<<
+        f >>looping?
     ] when 
     2dup 0 port3-newly-set? [ dup SOUND-UFO  play-invaders-sound ] when
     2dup 1 port3-newly-set? [ dup SOUND-SHOT play-invaders-sound ] when
@@ -229,9 +229,9 @@ M: space-invaders reset ( cpu -- )
     ] [
         [ [ 16667 - ] dip cycles<< ] keep
         dup last-interrupt>> 0x10 = [
-            0x08 over last-interrupt<< 0x08 swap interrupt
+            0x08 >>last-interrupt 0x08 swap interrupt
         ] [
-            0x10 over last-interrupt<< 0x10 swap interrupt
+            0x10 >>last-interrupt 0x10 swap interrupt
         ] if
     ] if ;
 
@@ -278,7 +278,7 @@ M: space-invaders reset ( cpu -- )
 TUPLE: invaders-gadget < gadget cpu quit? windowed? ;
 
 invaders-gadget H{
-    { T{ key-down f f "ESC" }    [ t over quit?<< dup windowed?>> [ close-window ] [ drop ] if ] }
+    { T{ key-down f f "ESC" }    [ t >>quit? dup windowed?>> [ close-window ] [ drop ] if ] }
     { T{ key-down f f "BACKSPACE" } [ cpu>> coin-down ] }
     { T{ key-up   f f "BACKSPACE" } [ cpu>> coin-up ] }
     { T{ key-down f f "1" }         [ cpu>> player1-down ] }
@@ -377,7 +377,7 @@ M: space-invaders update-video ( value addr cpu -- )
 
 M: invaders-gadget graft* ( gadget -- )
     dup cpu>> init-sounds
-    f over quit?<<
+    f >>quit?
     [ gmt timestamp>micros swap invaders-process ] curry
     "Space invaders" threads:spawn drop ;
 
diff --git a/extra/trees/avl/avl.factor b/extra/trees/avl/avl.factor
index b5efda4a62..db131c5ddb 100644
--- a/extra/trees/avl/avl.factor
+++ b/extra/trees/avl/avl.factor
@@ -74,7 +74,7 @@ DEFER: avl-set
 
 : (avl-set) ( value key node -- node taller? )
     2dup key>> = [
-        -rot pick key<< over value<< f
+        -rot pick key<< >>value f
     ] [ avl-insert ] if ;
 
 : avl-set ( value key node -- node taller? )
@@ -85,7 +85,7 @@ M: avl set-at ( value key node -- )
 
 : delete-select-rotate ( node -- node shorter? )
     dup node+link balance>> zero? [
-        current-side get neg over balance<<
+        current-side get neg >>balance
         current-side get over node+link balance<< rotate f
     ] [
         select-rotate t
@@ -100,7 +100,7 @@ M: avl set-at ( value key node -- )
 
 : balance-delete ( node -- node shorter? )
     current-side get over balance>> {
-        { [ dup zero? ] [ drop neg over balance<< f ] }
+        { [ dup zero? ] [ drop neg >>balance f ] }
         { [ 2dup = ] [ 2drop 0 >>balance t ] }
         [ drop neg increase-balance rebalance-delete ]
     } cond ;