sequences.extras: another test case and make count= compare with >

diff --git a/extra/sequences/extras/extras-tests.factor b/extra/sequences/extras/extras-tests.factor
index c962ad68022f62750f8022c4c74bab253bd6c568..c74c8e12b593db4cdb14c8cb994083d92fa7c1b8 100644 (file)
--- a/extra/sequences/extras/extras-tests.factor
+++ b/extra/sequences/extras/extras-tests.factor
@@ -382,6 +382,9 @@ strings tools.test ;
 { 1 t } [ 1 { 1 1 3 4 } [ dupd = ] 2 count= ] unit-test
 { 1 f } [ 1 { 1 1 3 4 } [ dupd = ] 3 count= ] unit-test
 { 4 t } [ 0 { 1 1 3 4 } [ [ 1 + dup ] dip = ] 3 count= ] unit-test
+{ 5 8 f } [ 0 1 { 1 1 2 3 5 8 } [ [ swap dupd + ] dip pick = ] 4 count= ] unit-test
+{ 8 13 t } [ 0 1 { 1 1 0 3 0 8 } [ [ swap dupd + ] dip pick = ] 4 count= ] unit-test
+{ 8 13 f } [ 0 1 { 1 1 2 3 5 8 } [ [ swap dupd + ] dip pick = ] 8 count= ] unit-test
 
 { SBUF" aco" SBUF" ftr"  } [ SBUF" factor" dup [ even? ] extract! ] unit-test
 

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 3a35fd629ca52077bc0b05163d25a61e567384cf..ed97389d291b3f82090f97f781fbbc767223d10e 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -992,7 +992,7 @@ PRIVATE>
 
 : count= ( ... seq quot: ( ... elt -- ... ? ) n -- ... ? )
     [ 0 ] 3dip [
-        '[ swap _ dip swap [ 1 + ] when dup _ >= ] find 2drop
+        '[ swap _ dip swap [ 1 + ] when dup _ > ] find 2drop
     ] keep = ; inline
 
 :: shorten* ( vector n -- seq )