game-of-life: more speed in count-neighbors.

diff --git a/extra/game-of-life/game-of-life.factor b/extra/game-of-life/game-of-life.factor
index ddff0ae43716ce505c46cb4637ad5b2499336e5e..5bf48e11518985b00e1189f5b1f22fbaa809b5af 100644 (file)
--- a/extra/game-of-life/game-of-life.factor
+++ b/extra/game-of-life/game-of-life.factor
@@ -17,7 +17,7 @@ IN: game-of-life
     [ length ] [ first length ] bi ;
 
 :: wraparound ( x min max -- y )
-    x min < [ max ] [ x max > min x ? ] if ; inline
+    x min fixnum< [ max ] [ x max fixnum> min x ? ] if ; inline
 
 :: count-neighbors ( grid -- counts )
     grid grid-dim { fixnum fixnum } declare :> ( rows cols )
@@ -25,7 +25,7 @@ IN: game-of-life
         cols <iota> [| i |
             { -1 0 1 } [
                 { -1 0 1 } [
-                    2dup [ zero? ] both? [ 2drop f ] [
+                    2dup [ 0 eq? ] both? [ 2drop f ] [
                         [ i fixnum+fast 0 cols 1 - wraparound ]
                         [ j fixnum+fast 0 rows 1 - wraparound ] bi*
                         { fixnum fixnum } declare grid