Merge branch 'master' of git://factorcode.org/git/factor

* 'master' of git://factorcode.org/git/factor: (23 commits)
  only use -fPIC on the ffi library
  fix load errors, help lint
  add using
  build with -fPIC on linux64
  update code for usages of add-library
  move a lot of words to alien.libraries
  Slides from talk at PyCon VM summit, Chicago 2009
  Fix hang when running ui tests
  Fix compiler.tree.debugger tests
  Merge tools.test.ui into ui.gadgets.debug
  compile an ffi test library, reduce factor runtime by 6kb!
  make add-library normalize-path, use libfactor-ffi-tests for testing ffi
  add sms, twitter fields to account.  create sitewatcher account when user registers
  Better error message if user forgets with-ui
  Fix hello-unicode for deployment
  remove loading freetype library on CE
  remove dead freetype code from Makefile
  A+b now focuses the search field
  Fix bitrot in compiler.tree.debugger
  - definitions.icons now has a reference article
  ...

diff --git a/extra/project-euler/001/001-tests.factor b/extra/project-euler/001/001-tests.factor
index 8d2461a510972947306a36688820cddb34c25124..1cab2756192b690b3ded1aa9fb4a207714873760 100644 (file)
--- a/extra/project-euler/001/001-tests.factor
+++ b/extra/project-euler/001/001-tests.factor
@@ -4,3 +4,4 @@ IN: project-euler.001.tests
 [ 233168 ] [ euler001 ] unit-test
 [ 233168 ] [ euler001a ] unit-test
 [ 233168 ] [ euler001b ] unit-test
+[ 233168 ] [ euler001c ] unit-test

diff --git a/extra/project-euler/001/001.factor b/extra/project-euler/001/001.factor
index de4345db689e8f3dfc5b5b395c007a46c20f5042..17f8d0386d80dbbb591530f0892f041ae7eb709f 100644 (file)
--- a/extra/project-euler/001/001.factor
+++ b/extra/project-euler/001/001.factor
@@ -1,4 +1,4 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math math.ranges sequences project-euler.common ;
 IN: project-euler.001
@@ -51,4 +51,11 @@ PRIVATE>
 ! [ euler001b ] 100 ave-time
 ! 0 ms run / 0 ms GC ave time - 100 trials
 
+
+: euler001c ( -- answer )
+    1000 [ { 3 5 } [ mod 0 = ] with contains? ] filter sum ;
+
+! [ euler001c ] 100 ave-time
+! 0 ms ave run time - 0.06 SD (100 trials)
+
 SOLUTION: euler001

diff --git a/extra/project-euler/033/033.factor b/extra/project-euler/033/033.factor
index c7c3fea5da7d52e6e100776d2f03e131e1202e98..780015ab77b8b6e90a96559036c2d69b0c4a20f8 100644 (file)
--- a/extra/project-euler/033/033.factor
+++ b/extra/project-euler/033/033.factor
@@ -33,7 +33,7 @@ IN: project-euler.033
     10 99 [a,b] dup cartesian-product [ first2 < ] filter ;
 
 : safe? ( ax xb -- ? )
-    [ 10 /mod ] bi@ -roll = rot zero? not and nip ;
+    [ 10 /mod ] bi@ [ = ] dip zero? not and nip ;
 
 : ax/xb ( ax xb -- z/f )
     2dup safe? [ [ 10 /mod ] bi@ 2nip / ] [ 2drop f ] if ;

diff --git a/extra/project-euler/common/common.factor b/extra/project-euler/common/common.factor
index 423512465eda8cf7d1d0fa312411c046f6c8db84..0ad3225e3ed056c587cc2cd79003b9b75f9ca0c1 100644 (file)
--- a/extra/project-euler/common/common.factor
+++ b/extra/project-euler/common/common.factor
@@ -57,7 +57,7 @@ PRIVATE>
     >lower [ CHAR: a - 1+ ] sigma ;
 
 : cartesian-product ( seq1 seq2 -- seq1xseq2 )
-    swap [ swap [ 2array ] with map ] with map concat ;
+    [ [ 2array ] with map ] curry map concat ;
 
 : log10 ( m -- n )
     log 10 log / ;
@@ -75,6 +75,9 @@ PRIVATE>
 : number>digits ( n -- seq )
     [ dup 0 = not ] [ 10 /mod ] produce reverse nip ;
 
+: number-length ( n -- m )
+    log10 floor 1+ >integer ;
+
 : nth-triangle ( n -- n )
     dup 1+ * 2 / ;