remove lib usage, fix compile errors

diff --git a/extra/project-euler/017/017.factor b/extra/project-euler/017/017.factor
index cf58e88ffeb7648e6af0b5ab3dde92b5c372d074..5f6541873ac33fcbdcac550f7cc8962d8fa2c1f0 100644 (file)
--- a/extra/project-euler/017/017.factor
+++ b/extra/project-euler/017/017.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math.ranges math.text.english sequences sequences.lib strings
+USING: kernel math.ranges math.text.english sequences strings
     ascii combinators.short-circuit ;
 IN: project-euler.017
 

diff --git a/extra/project-euler/019/019.factor b/extra/project-euler/019/019.factor
index b29495f91354badf8f58fe2d7a31c8bef971468e..9482b337bb56da9db95be82dcd7a68403e436371 100644 (file)
--- a/extra/project-euler/019/019.factor
+++ b/extra/project-euler/019/019.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Samuel Tardieu, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: calendar combinators kernel math math.ranges namespaces sequences
-    sequences.lib math.order ;
+    math.order ;
 IN: project-euler.019
 
 ! http://projecteuler.net/index.php?section=problems&id=19
@@ -32,7 +32,7 @@ IN: project-euler.019
 
 : euler019 ( -- answer )
     1901 2000 [a,b] [
-        12 [1,b] [ 1 zeller-congruence ] map-with
+        12 [1,b] [ 1 zeller-congruence ] with map
     ] map concat [ zero? ] count ;
 
 ! [ euler019 ] 100 ave-time

diff --git a/extra/project-euler/022/022.factor b/extra/project-euler/022/022.factor
index 82054ce014048b6b5cb790415259b359ed736371..a508ddea6c9a9fb0f2e56883dd52ea0f800cd8be 100644 (file)
--- a/extra/project-euler/022/022.factor
+++ b/extra/project-euler/022/022.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ascii io.encodings.ascii io.files kernel math project-euler.common
-    sequences sequences.lib sorting splitting ;
+    sequences sorting splitting ;
 IN: project-euler.022
 
 ! http://projecteuler.net/index.php?section=problems&id=22

diff --git a/extra/project-euler/030/030.factor b/extra/project-euler/030/030.factor
index 53d6b199fbffd4ae71e3f114ff0307d7ce88b93d..250494c0dc2f4953fdc32a0cc528b9ce578c5cac 100644 (file)
--- a/extra/project-euler/030/030.factor
+++ b/extra/project-euler/030/030.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.functions project-euler.common sequences sequences.lib ;
+USING: kernel math math.functions project-euler.common sequences ;
 IN: project-euler.030
 
 ! http://projecteuler.net/index.php?section=problems&id=30

diff --git a/extra/project-euler/034/034.factor b/extra/project-euler/034/034.factor
index cf73ee828bfb6a453dc128d493e0cce889ec0597..28c4fa5dc783c9b0a4540af2fe327cb021a96381 100644 (file)
--- a/extra/project-euler/034/034.factor
+++ b/extra/project-euler/034/034.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math.ranges project-euler.common sequences sequences.lib ;
+USING: kernel math.ranges project-euler.common sequences ;
 IN: project-euler.034
 
 ! http://projecteuler.net/index.php?section=problems&id=34

diff --git a/extra/project-euler/035/035.factor b/extra/project-euler/035/035.factor
index cec9bc695770efa991aac902ac9d5cffc4689e0f..8e8b654d28f163bdb0caa6246dfb73794bba1ce2 100755 (executable)
--- a/extra/project-euler/035/035.factor
+++ b/extra/project-euler/035/035.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math math.combinatorics math.parser math.primes
-    project-euler.common sequences sequences.lib sets ;
+    project-euler.common sequences sets ;
 IN: project-euler.035
 
 ! http://projecteuler.net/index.php?section=problems&id=35

diff --git a/extra/project-euler/039/039.factor b/extra/project-euler/039/039.factor
index 7a9f51f1d32b93ee21857b259a8ea22b320f6ee4..d0caa6d0e407961b5454bb5cb2835d045d22bff7 100755 (executable)
--- a/extra/project-euler/039/039.factor
+++ b/extra/project-euler/039/039.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators.lib kernel math math.ranges
+USING: arrays kernel math math.ranges
     namespaces project-euler.common sequences ;
 IN: project-euler.039
 

diff --git a/extra/project-euler/042/042.factor b/extra/project-euler/042/042.factor
index da26e3492772b990e27993ea08f4b687ac111c4b..8ae95d6db7e0bb2a0c229c9f9147daef445270ba 100644 (file)
--- a/extra/project-euler/042/042.factor
+++ b/extra/project-euler/042/042.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ascii io.files kernel math math.functions namespaces make
-    project-euler.common sequences sequences.lib splitting io.encodings.ascii ;
+    project-euler.common sequences splitting io.encodings.ascii ;
 IN: project-euler.042
 
 ! http://projecteuler.net/index.php?section=problems&id=42

diff --git a/extra/project-euler/055/055.factor b/extra/project-euler/055/055.factor
index 289f3a002a9d186c0a792da9e6e36490e79e455b..bf1dd43b979acde78f78125aa9ee59d790454cb6 100644 (file)
--- a/extra/project-euler/055/055.factor
+++ b/extra/project-euler/055/055.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.parser project-euler.common sequences sequences.lib ;
+USING: kernel math math.parser project-euler.common sequences ;
 IN: project-euler.055
 
 ! http://projecteuler.net/index.php?section=problems&id=55
@@ -49,8 +49,8 @@ IN: project-euler.055
 
 : (lychrel?) ( n iteration -- ? )
     dup 50 < [
-        >r add-reverse dup palindrome?
-        [ r> 2drop f ] [ r> 1+ (lychrel?) ] if
+        [ add-reverse ] dip over palindrome?
+        [ 2drop f ] [ 1+ (lychrel?) ] if
     ] [
         2drop t
     ] if ;

diff --git a/extra/project-euler/059/059.factor b/extra/project-euler/059/059.factor
index f209b50a467ca73ee83438e5460a5a4223ec66ab..e3ab9762d8b6c2dbdfe73db7dd3eb8cab14e144c 100644 (file)
--- a/extra/project-euler/059/059.factor
+++ b/extra/project-euler/059/059.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays ascii assocs hashtables io.encodings.ascii io.files kernel math
-    math.parser namespaces make sequences sequences.lib sequences.private sorting
+    math.parser namespaces make sequences sequences.private sorting
     splitting grouping strings sets accessors ;
 IN: project-euler.059
 

diff --git a/extra/project-euler/116/116.factor b/extra/project-euler/116/116.factor
index 5e2059ad9ace5de71503e46b0dbfe09c0d1bcec0..0e3633dc9a6f3a79318d6eefaf58c0fd793204cc 100644 (file)
--- a/extra/project-euler/116/116.factor
+++ b/extra/project-euler/116/116.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.ranges sequences sequences.lib ;
+USING: kernel math math.ranges sequences ;
 IN: project-euler.116
 
 ! http://projecteuler.net/index.php?section=problems&id=116

diff --git a/extra/project-euler/148/148.factor b/extra/project-euler/148/148.factor
index 49fd9a4895151859aa967eb9252adae9eaa57a1d..0509936e524069ca82da983fc4c0fccb32e27118 100644 (file)
--- a/extra/project-euler/148/148.factor
+++ b/extra/project-euler/148/148.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.functions sequences sequences.lib ;
+USING: kernel math math.functions sequences ;
 IN: project-euler.148
 
 ! http://projecteuler.net/index.php?section=problems&id=148

diff --git a/extra/project-euler/151/151.factor b/extra/project-euler/151/151.factor
index b64ae3d49f8f857b38c08dfbaa9f728e2906cc6d..7913cf954012924ab3976a44c7286b5b9a1cd5bc 100644 (file)
--- a/extra/project-euler/151/151.factor
+++ b/extra/project-euler/151/151.factor
@@ -1,7 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs combinators kernel math math.order namespaces sequences
-    sequences.lib ;
+USING: assocs combinators kernel math math.order namespaces sequences ;
 IN: project-euler.151
 
 ! http://projecteuler.net/index.php?section=problems&id=151

diff --git a/extra/project-euler/186/186.factor b/extra/project-euler/186/186.factor
index 5308662daf19ed694b8e00270d8361af61dfcebc..7504e09a81fa08fcac25d705ec6591dcf95f90b8 100644 (file)
--- a/extra/project-euler/186/186.factor
+++ b/extra/project-euler/186/186.factor
@@ -1,5 +1,5 @@
 USING: circular disjoint-sets kernel math math.ranges
-       sequences sequences.lib ;
+sequences ;
 IN: project-euler.186
 
 : (generator) ( k -- n )

diff --git a/extra/project-euler/190/190.factor b/extra/project-euler/190/190.factor
index 35b93443622ce14869aad9228974bfd468de4f2b..c0b7cb577fbf563796987b5dd82f2a11f6795a23 100644 (file)
--- a/extra/project-euler/190/190.factor
+++ b/extra/project-euler/190/190.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences sequences.lib math math.functions math.ranges locals ;
+USING: kernel sequences math math.functions math.ranges locals ;
 IN: project-euler.190
 
 ! http://projecteuler.net/index.php?section=problems&id=190