Delete empty unit tests files, remove 1- and 1+, reorder IN: lines in a lot of places...

[factor.git] / extra / benchmark / nsieve-bits / nsieve-bits.factor

diff --git a/extra/benchmark/nsieve-bits/nsieve-bits.factor b/extra/benchmark/nsieve-bits/nsieve-bits.factor
index 246a962a55b554e00e8b4b1e239a4dbb222162c1..9ccc2d8616171bf851e298534d39dc7d7635b400 100644 (file)
--- a/extra/benchmark/nsieve-bits/nsieve-bits.factor
+++ b/extra/benchmark/nsieve-bits/nsieve-bits.factor
@@ -1,6 +1,6 @@
-IN: benchmark.nsieve-bits
 USING: math math.parser sequences sequences.private kernel
 bit-arrays make io ;
+IN: benchmark.nsieve-bits
 
 : clear-flags ( step i seq -- )
     2dup length >= [
@@ -13,14 +13,14 @@ bit-arrays make io ;
     2dup length < [
         2dup nth-unsafe [
             over dup 2 * pick clear-flags
-            rot 1+ -rot ! increment count
-        ] when [ 1+ ] dip (nsieve-bits)
+            rot 1 + -rot ! increment count
+        ] when [ 1 + ] dip (nsieve-bits)
     ] [
         2drop
     ] if ; inline recursive
 
 : nsieve-bits ( m -- count )
-    0 2 rot 1+ <bit-array> dup set-bits (nsieve-bits) ;
+    0 2 rot 1 + <bit-array> dup set-bits (nsieve-bits) ;
 
 : nsieve-bits. ( m -- )
     [ "Primes up to " % dup # " " % nsieve-bits # ] "" make
@@ -28,7 +28,7 @@ bit-arrays make io ;
 
 : nsieve-bits-main ( n -- )
     dup 2^ 10000 * nsieve-bits.
-    dup 1- 2^ 10000 * nsieve-bits.
+    dup 1 - 2^ 10000 * nsieve-bits.
     2 - 2^ 10000 * nsieve-bits. ;
 
 : nsieve-bits-main* ( -- ) 11 nsieve-bits-main ;