From e5c2344ce469b58082ef485faee664cdca24f0de Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 7 Mar 2010 21:56:40 -0800 Subject: [PATCH] sequences: effects of push-if and push-either were too strict --- core/sequences/sequences.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 314447febf..3e0f102181 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -483,7 +483,7 @@ PRIVATE> : all? ( ... seq quot: ( ... elt -- ... ? ) -- ... ? ) (each) all-integers? ; inline -: push-if ( ... elt quot: ( ... elt -- ... ? ) accum -- ... ) +: push-if ( ..a elt quot: ( ..a elt -- ..b ? ) accum -- ..b ) [ keep ] dip rot [ push ] [ 2drop ] if ; inline : selector-for ( quot exemplar -- selector accum ) @@ -498,7 +498,7 @@ PRIVATE> : filter ( ... seq quot: ( ... elt -- ... ? ) -- ... subseq ) over filter-as ; inline -: push-either ( ... elt quot: ( ... elt -- ... ? ) accum1 accum2 -- ... ) +: push-either ( ..a elt quot: ( ..a elt -- ..b ? ) accum1 accum2 -- ..b ) [ keep swap ] 2dip ? push ; inline : 2selector ( quot -- selector accum1 accum2 )