Use more combinators

diff --git a/extra/math/primes/primes.factor b/extra/math/primes/primes.factor
index 685124e4e989183ffa7fdc3c75ad3efe6986c82e..eeb1b66a89f2f03e62470bfa4d85f3e88bd2b1b5 100644 (file)
--- a/extra/math/primes/primes.factor
+++ b/extra/math/primes/primes.factor
@@ -45,7 +45,7 @@ PRIVATE>
 
 : primes-between ( low high -- seq )
   primes-upto
-  >r 1- next-prime r>
+  [ 1- next-prime ] dip
   [ [ <=> ] binsearch ] keep [ length ] keep <slice> ; foldable
 
 : coprime? ( a b -- ? ) gcd nip 1 = ; foldable

diff --git a/extra/project-euler/169/169.factor b/extra/project-euler/169/169.factor
index 61645bf50b4ddf0fa18bf34e5c9462b2519b2246..35fb2c2c1e920a041e4895bd20135314cc496fab 100644 (file)
--- a/extra/project-euler/169/169.factor
+++ b/extra/project-euler/169/169.factor
@@ -30,7 +30,7 @@ MEMO: fn ( n -- x )
     {
         { [ dup 2 < ]  [ drop 1 ] }
         { [ dup odd? ] [ 2/ fn ] }
-        { [ t ]        [ 2/ [ fn ] keep 1- fn + ] }
+        { [ t ]        [ 2/ [ fn ] [ 1- fn + ] bi ] }
     } cond ;
 
 : euler169 ( -- result )