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 28600b6c48667452795f794d4138ee6d3892699b..60f180877f118dec7d610c732fbb4f9246dc17dc 100644 (file)
--- 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 68efbdd2b4e40398f9b67b93fea4b523206b5903..69252bf762b7d09dbb1e351b4975667274a44749 100644 (file)
--- 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 ;