diff --git a/extra/benchmark/binary-search/binary-search.factor b/extra/benchmark/binary-search/binary-search.factor
index e5c81a954d..5883836b7d 100644
--- a/extra/benchmark/binary-search/binary-search.factor
+++ b/extra/benchmark/binary-search/binary-search.factor
@@ -1,13 +1,17 @@
! Copyright (C) 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
-USING: binary-search kernel math.primes.list math.ranges sequences
-prettyprint ;
+USING: binary-search compiler.units kernel math.primes math.ranges
+memoize prettyprint sequences ;
IN: benchmark.binary-search
-: binary-search-benchmark ( -- )
- 1 1000000 [a,b] [ primes-under-million sorted-member? ] map length . ;
+[
+ MEMO: primes-under-million ( -- seq ) 1000000 primes-upto ;
+] with-compilation-unit
! Force computation of the primes list before benchmarking the binary search
primes-under-million drop
+: binary-search-benchmark ( -- )
+ 1 1000000 [a,b] [ primes-under-million sorted-member? ] map length . ;
+
MAIN: binary-search-benchmark
diff --git a/extra/benchmark/crc32/crc32.factor b/extra/benchmark/crc32/crc32.factor
index 0e5482da30..2fea4eb1f1 100755
--- a/extra/benchmark/crc32/crc32.factor
+++ b/extra/benchmark/crc32/crc32.factor
@@ -1,10 +1,10 @@
USING: checksums checksums.crc32 io.encodings.ascii io.files kernel math ;
IN: benchmark.crc32
-: crc32-primes-list ( -- )
+: crc32-file ( -- )
10 [
- "resource:extra/math/primes/list/list.factor"
+ "resource:basis/mime/multipart/multipart-tests.factor"
crc32 checksum-file drop
] times ;
-MAIN: crc32-primes-list
+MAIN: crc32-file
diff --git a/extra/benchmark/md5/md5.factor b/extra/benchmark/md5/md5.factor
index 8a259c1217..24578ec677 100644
--- a/extra/benchmark/md5/md5.factor
+++ b/extra/benchmark/md5/md5.factor
@@ -1,7 +1,7 @@
USING: checksums checksums.md5 io.files kernel ;
IN: benchmark.md5
-: md5-primes-list ( -- )
- "resource:extra/math/primes/list/list.factor" md5 checksum-file drop ;
+: md5-file ( -- )
+ "resource:basis/mime/multipart/multipart-tests.factor" md5 checksum-file drop ;
-MAIN: md5-primes-list
+MAIN: md5-file
diff --git a/extra/benchmark/sha1/sha1.factor b/extra/benchmark/sha1/sha1.factor
index d5ff5673c2..585368e836 100644
--- a/extra/benchmark/sha1/sha1.factor
+++ b/extra/benchmark/sha1/sha1.factor
@@ -1,7 +1,7 @@
USING: checksums checksums.sha1 io.files kernel ;
IN: benchmark.sha1
-: sha1-primes-list ( -- )
- "resource:extra/math/primes/list/list.factor" sha1 checksum-file drop ;
+: sha1-file ( -- )
+ "resource:basis/mime/multipart/multipart-tests.factor" sha1 checksum-file drop ;
-MAIN: sha1-primes-list
+MAIN: sha1-file
diff --git a/extra/math/primes/erato/authors.txt b/extra/math/primes/erato/authors.txt
new file mode 100644
index 0000000000..f3b0233f74
--- /dev/null
+++ b/extra/math/primes/erato/authors.txt
@@ -0,0 +1 @@
+Samuel Tardieu
diff --git a/extra/math/primes/erato/erato.factor b/extra/math/primes/erato/erato.factor
index effcd7b135..70a9c10ff5 100644
--- a/extra/math/primes/erato/erato.factor
+++ b/extra/math/primes/erato/erato.factor
@@ -1,3 +1,5 @@
+! Copyright (C) 2009 Samuel Tardieu.
+! See http://factorcode.org/license.txt for BSD license.
USING: bit-arrays kernel math math.functions math.ranges sequences ;
IN: math.primes.erato
diff --git a/extra/math/primes/erato/summary.txt b/extra/math/primes/erato/summary.txt
new file mode 100644
index 0000000000..6ecb893cd5
--- /dev/null
+++ b/extra/math/primes/erato/summary.txt
@@ -0,0 +1 @@
+Eratosthene sieve
diff --git a/extra/math/primes/factors/factors-tests.factor b/extra/math/primes/factors/factors-tests.factor
index 70b905f4ab..f247683c1c 100644
--- a/extra/math/primes/factors/factors-tests.factor
+++ b/extra/math/primes/factors/factors-tests.factor
@@ -1,6 +1,8 @@
USING: math.primes.factors tools.test ;
{ { 999983 999983 1000003 } } [ 999969000187000867 factors ] unit-test
+{ { } } [ -5 factors ] unit-test
{ { { 999983 2 } { 1000003 1 } } } [ 999969000187000867 group-factors ] unit-test
{ { 999983 1000003 } } [ 999969000187000867 unique-factors ] unit-test
{ 999967000236000612 } [ 999969000187000867 totient ] unit-test
+{ 0 } [ 1 totient ] unit-test
diff --git a/extra/math/primes/factors/factors.factor b/extra/math/primes/factors/factors.factor
index 80c93f2ae0..282c46c82e 100644
--- a/extra/math/primes/factors/factors.factor
+++ b/extra/math/primes/factors/factors.factor
@@ -1,39 +1,36 @@
-! Copyright (C) 2007 Samuel Tardieu.
+! Copyright (C) 2007-2009 Samuel Tardieu.
! See http://factorcode.org/license.txt for BSD license.
USING: arrays kernel lists make math math.primes sequences ;
IN: math.primes.factors
<PRIVATE
-: (factor) ( n d -- n' )
- 2dup mod zero? [ [ / ] keep dup , (factor) ] [ drop ] if ;
+: count-factor ( n d -- n' c )
+ 0 [ [ 2dup mod zero? ] dip swap ] [ [ [ / ] keep ] dip 1+ ] [ ] while nip ;
+
+: (factor) ( n d -- n' ) dup [ , ] curry [ count-factor ] dip times ;
: (count) ( n d -- n' )
- [ (factor) ] { } make
- [ [ first ] [ length ] bi 2array , ] unless-empty ;
+ dup [ swap 2array , ] curry
+ [ count-factor dup zero? [ drop ] ] dip if ;
: (unique) ( n d -- n' )
- [ (factor) ] { } make
- [ first , ] unless-empty ;
+ dup [ , ] curry [ count-factor zero? ] dip unless ;
: (factors) ( quot list n -- )
dup 1 > [
swap uncons swap [ pick call ] dip swap (factors)
- ] [ 3drop ] if ;
+ ] [ 3drop ] if ; inline recursive
-: (decompose) ( n quot -- seq )
- [ lprimes rot (factors) ] { } make ;
+: decompose ( n quot -- seq ) [ lprimes rot (factors) ] { } make ; inline
PRIVATE>
-: factors ( n -- seq )
- [ (factor) ] (decompose) ; foldable
+: factors ( n -- seq ) [ (factor) ] decompose ; flushable
-: group-factors ( n -- seq )
- [ (count) ] (decompose) ; foldable
+: group-factors ( n -- seq ) [ (count) ] decompose ; flushable
-: unique-factors ( n -- seq )
- [ (unique) ] (decompose) ; foldable
+: unique-factors ( n -- seq ) [ (unique) ] decompose ; flushable
: totient ( n -- t )
dup 2 < [
diff --git a/extra/math/primes/list/authors.txt b/extra/math/primes/list/authors.txt
deleted file mode 100644
index 7c1b2f2279..0000000000
--- a/extra/math/primes/list/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Doug Coleman
diff --git a/extra/math/primes/list/list.factor b/extra/math/primes/list/list.factor
deleted file mode 100644
index 7467d126d0..0000000000
--- a/extra/math/primes/list/list.factor
+++ /dev/null
@@ -1,4 +0,0 @@
-USING: math.primes memoize ;
-IN: math.primes.list
-
-MEMO: primes-under-million ( -- seq ) 1000000 primes-upto ;
diff --git a/extra/project-euler/057/057-tests.factor b/extra/project-euler/057/057-tests.factor
new file mode 100644
index 0000000000..e10274ce25
--- /dev/null
+++ b/extra/project-euler/057/057-tests.factor
@@ -0,0 +1,3 @@
+USING: project-euler.057 tools.test ;
+
+{ 153 } [ euler057 ] unit-test