From 977f5da07d575621379e32335a728be3c253019e Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 17 Dec 2008 19:28:07 -0600
Subject: [PATCH] Update benchmarks for >r/r> removal

---
 extra/benchmark/binary-trees/binary-trees.factor | 4 ++--
 extra/benchmark/knucleotide/knucleotide.factor   | 2 +-
 extra/benchmark/nsieve-bits/nsieve-bits.factor   | 4 ++--
 extra/benchmark/nsieve-bytes/nsieve-bytes.factor | 4 ++--
 extra/benchmark/nsieve/nsieve.factor             | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extra/benchmark/binary-trees/binary-trees.factor b/extra/benchmark/binary-trees/binary-trees.factor
index f562072f28..8e3918656a 100644
--- a/extra/benchmark/binary-trees/binary-trees.factor
+++ b/extra/benchmark/binary-trees/binary-trees.factor
@@ -10,8 +10,8 @@ C: <tree-node> tree-node
     dup 0 > [
         1 -
         [ drop ]
-        [ >r 2 * 1 - r> bottom-up-tree ]
-        [ >r 2 *     r> bottom-up-tree ] 2tri
+        [ [ 2 * 1 - ] dip bottom-up-tree ]
+        [ [ 2 *     ] dip bottom-up-tree ] 2tri
     ] [
         drop f f
     ] if <tree-node> ; inline recursive
diff --git a/extra/benchmark/knucleotide/knucleotide.factor b/extra/benchmark/knucleotide/knucleotide.factor
index 7b8e2d34c9..7e65059643 100644
--- a/extra/benchmark/knucleotide/knucleotide.factor
+++ b/extra/benchmark/knucleotide/knucleotide.factor
@@ -29,7 +29,7 @@ IN: benchmark.knucleotide
 : small-groups ( x n -- b )
     swap
     [ length swap - 1+ ] 2keep
-    [ >r over + r> subseq ] 2curry map ;
+    [ [ over + ] dip subseq ] 2curry map ;
 
 : handle-table ( inputs n -- )
     small-groups
diff --git a/extra/benchmark/nsieve-bits/nsieve-bits.factor b/extra/benchmark/nsieve-bits/nsieve-bits.factor
index ddb70972b9..246a962a55 100644
--- a/extra/benchmark/nsieve-bits/nsieve-bits.factor
+++ b/extra/benchmark/nsieve-bits/nsieve-bits.factor
@@ -6,7 +6,7 @@ bit-arrays make io ;
     2dup length >= [
         3drop
     ] [
-        f 2over set-nth-unsafe >r over + r> clear-flags
+        f 2over set-nth-unsafe [ over + ] dip clear-flags
     ] if ; inline recursive
 
 : (nsieve-bits) ( count i seq -- count )
@@ -14,7 +14,7 @@ bit-arrays make io ;
         2dup nth-unsafe [
             over dup 2 * pick clear-flags
             rot 1+ -rot ! increment count
-        ] when >r 1+ r> (nsieve-bits)
+        ] when [ 1+ ] dip (nsieve-bits)
     ] [
         2drop
     ] if ; inline recursive
diff --git a/extra/benchmark/nsieve-bytes/nsieve-bytes.factor b/extra/benchmark/nsieve-bytes/nsieve-bytes.factor
index 11745e4463..bbeccf750b 100644
--- a/extra/benchmark/nsieve-bytes/nsieve-bytes.factor
+++ b/extra/benchmark/nsieve-bytes/nsieve-bytes.factor
@@ -6,7 +6,7 @@ byte-arrays make io ;
     2dup length >= [
         3drop
     ] [
-        0 2over set-nth-unsafe >r over + r> clear-flags
+        0 2over set-nth-unsafe [ over + ] dip clear-flags
     ] if ; inline recursive
 
 : (nsieve) ( count i seq -- count )
@@ -14,7 +14,7 @@ byte-arrays make io ;
         2dup nth-unsafe 0 > [
             over dup 2 * pick clear-flags
             rot 1+ -rot ! increment count
-        ] when >r 1+ r> (nsieve)
+        ] when [ 1+ ] dip (nsieve)
     ] [
         2drop
     ] if ; inline recursive
diff --git a/extra/benchmark/nsieve/nsieve.factor b/extra/benchmark/nsieve/nsieve.factor
index 76d991f734..6fbc144e80 100644
--- a/extra/benchmark/nsieve/nsieve.factor
+++ b/extra/benchmark/nsieve/nsieve.factor
@@ -6,7 +6,7 @@ arrays make io ;
     2dup length >= [
         3drop
     ] [
-        f 2over set-nth-unsafe >r over + r> clear-flags
+        f 2over set-nth-unsafe [ over + ] dip clear-flags
     ] if ; inline recursive
 
 : (nsieve) ( count i seq -- count )
@@ -14,7 +14,7 @@ arrays make io ;
         2dup nth-unsafe [
             over dup 2 * pick clear-flags
             rot 1+ -rot ! increment count
-        ] when >r 1+ r> (nsieve)
+        ] when [ 1+ ] dip (nsieve)
     ] [
         2drop
     ] if ; inline recursive