From: Erik Charlebois <erikcharlebois@gmail.com>
Date: Fri, 29 Jul 2011 05:56:13 +0000 (-0400)
Subject: Replace deprecated words with alternatives.
X-Git-Tag: 0.97~4307^2~11^2~1
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=6fef726d5833c1232361334f00c1edd15e694933

Replace deprecated words with alternatives.

A load-all on OS X now completes without any deprecated word warnings.
---

diff --git a/extra/24-game/24-game.factor b/extra/24-game/24-game.factor
index 28600b6c48..60f180877f 100644
--- a/extra/24-game/24-game.factor
+++ b/extra/24-game/24-game.factor
@@ -8,6 +8,7 @@ arrays words quotations accessors math.parser backtrack assocs ;
 IN: 24-game
 SYMBOL: commands
 : nop ( -- ) ;
+: spin ( a b c -- c b a ) swapd swap swap ;
 : do-something ( a b -- c ) { + - * } amb-execute ;
 : maybe-swap ( a b -- a b ) { nop swap } amb-execute ;
 : some-rots ( a b c -- a b c )
diff --git a/extra/trees/avl/avl.factor b/extra/trees/avl/avl.factor
index 68efbdd2b4..69252bf762 100644
--- a/extra/trees/avl/avl.factor
+++ b/extra/trees/avl/avl.factor
@@ -136,7 +136,7 @@ GENERIC: avl-delete ( key node -- node shorter? deleted? )
 M: f avl-delete ( key f -- f f f ) nip f f ;
 
 : (avl-delete) ( key node -- node shorter? deleted? )
-    tuck node-link avl-delete [
+    swap over node-link avl-delete [
         [ over set-node-link ] dip [ balance-delete ] [ f ] if
     ] dip ;