From 12b24af9343719b9c1c1b4c8e2c2c7d40654dbf9 Mon Sep 17 00:00:00 2001
From: Aaron Schaefer <aaron@elasticdog.com>
Date: Mon, 14 Jan 2008 02:38:23 -0500
Subject: [PATCH] Simplify totient in math.primes.factors

---
 extra/math/primes/factors/factors.factor | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/extra/math/primes/factors/factors.factor b/extra/math/primes/factors/factors.factor
index b841d49f7d..66ec748535 100644
--- a/extra/math/primes/factors/factors.factor
+++ b/extra/math/primes/factors/factors.factor
@@ -6,36 +6,36 @@ IN: math.primes.factors
 <PRIVATE
 
 : (factor) ( n d -- n' )
-  2dup mod zero? [ [ / ] keep dup , (factor) ] [ drop ] if ;
+    2dup mod zero? [ [ / ] keep dup , (factor) ] [ drop ] if ;
 
 : (count) ( n d -- n' )
-  [ (factor) ] { } make
-  dup empty? [ drop ] [ [ first ] keep length 2array , ] if ;
+    [ (factor) ] { } make
+    dup empty? [ drop ] [ [ first ] keep length 2array , ] if ;
 
 : (unique) ( n d -- n' )
-  [ (factor) ] { } make
-  dup empty? [ drop ] [ first , ] if ;
+    [ (factor) ] { } make
+    dup empty? [ drop ] [ first , ] if ;
 
 : (factors) ( quot list n -- )
-  dup 1 > [ swap uncons >r pick call r> swap (factors) ] [ 3drop ] if ;
+    dup 1 > [ swap uncons >r pick call r> swap (factors) ] [ 3drop ] if ;
 
 : (decompose) ( n quot -- seq )
-  [ lprimes rot (factors) ] { } make ;
+    [ lprimes rot (factors) ] { } make ;
 
 PRIVATE>
 
 : factors ( n -- seq )
-  [ (factor) ] (decompose) ; foldable
+    [ (factor) ] (decompose) ; foldable
 
 : count-factors ( n -- seq )
-  [ (count) ] (decompose) ; foldable
+    [ (count) ] (decompose) ; foldable
 
 : unique-factors ( n -- seq )
-  [ (unique) ] (decompose) ; foldable
+    [ (unique) ] (decompose) ; foldable
 
 : totient ( n -- t )
-  dup 2 < [
-    drop 0
-  ] [
-   [ unique-factors dup 1 [ 1- * ] reduce swap product / ] keep *
-  ] if ; foldable
+    dup 2 < [
+        drop 0
+    ] [
+        dup unique-factors dup 1 [ 1- * ] reduce swap product / *
+    ] if ; foldable