From dd2a5729a7b3020c893f754a3693021c27ce1a9c Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Thu, 23 Aug 2012 09:35:09 -0700
Subject: [PATCH] math.primes.erato: bit faster by inlining.

---
 basis/math/primes/erato/erato.factor | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/basis/math/primes/erato/erato.factor b/basis/math/primes/erato/erato.factor
index 4df724cfc2..26fb40c633 100644
--- a/basis/math/primes/erato/erato.factor
+++ b/basis/math/primes/erato/erato.factor
@@ -9,16 +9,17 @@ IN: math.primes.erato
 CONSTANT: masks B{ 0 128 0 0 0 0 0 64 0 0 0 32 0 16 0 0 0 8 0 4 0 0 0 2 0 0 0 0 0 1 }
 
 : bit-pos ( n -- byte/f mask/f )
-    30 /mod masks nth-unsafe [ drop f f ] when-zero ;
+    30 /mod masks nth-unsafe [ drop f f ] when-zero ; inline
 
 : marked-unsafe? ( n arr -- ? )
-    [ bit-pos ] dip swap [ [ nth-unsafe ] [ bitand zero? not ] bi* ] [ 2drop f ] if* ;
+    [ bit-pos ] dip swap
+    [ [ nth-unsafe ] [ bitand zero? not ] bi* ] [ 2drop f ] if* ; inline
 
 : unmark ( n arr -- )
     [ bit-pos swap ] dip
-    over [ [ swap unmask ] change-nth-unsafe ] [ 3drop ] if ;
+    over [ [ swap unmask ] change-nth-unsafe ] [ 3drop ] if ; inline
 
-: upper-bound ( arr -- n ) length 30 * 1 - ;
+: upper-bound ( arr -- n ) length 30 * 1 - ; inline
 
 : unmark-multiples ( i arr -- )
     2dup marked-unsafe? [
@@ -26,9 +27,9 @@ CONSTANT: masks B{ 0 128 0 0 0 0 0 64 0 0 0 32 0 16 0 0 0 8 0 4 0 0 0 2 0 0 0 0
         [ unmark ] curry each
     ] [
         2drop
-    ] if ;
+    ] if ; inline
 
-: init-sieve ( n -- arr ) 30 /i 1 + 255 <array> >byte-array ;
+: init-sieve ( n -- arr ) 30 /i 1 + 255 <array> >byte-array ; inline
 
 PRIVATE>