Fixing bug in nil?

diff --git a/extra/lists/lazy/lazy.factor b/extra/lists/lazy/lazy.factor
index 03e5b0f8cc7e9e1394b3a3e06333caf8e88c3551..6beb6e402d9039c035fa7a669c5239053878aa34 100644 (file)
--- a/extra/lists/lazy/lazy.factor
+++ b/extra/lists/lazy/lazy.factor
@@ -72,7 +72,7 @@ M: memoized-cons cdr ( memoized-cons -- cdr )
 
 M: memoized-cons nil? ( memoized-cons -- bool )
     dup nil?>> not-memoized? [
-        dup original>> nil? [ >>nil? drop ] keep
+        dup original>> nil?  [ >>nil? drop ] keep
     ] [
         nil?>>
     ] if ;
@@ -157,22 +157,20 @@ TUPLE: lazy-filter cons quot ;
 C: <lazy-filter> lazy-filter
 
 : lfilter ( list quot -- result )
-        over nil? [ 2drop nil ] [ <lazy-filter> <memoized-cons> ] if ;
+    over nil? [ 2drop nil ] [ <lazy-filter> <memoized-cons> ] if ;
 
-: car-filter?    ( lazy-filter -- ? )
-    [ cons>> car ] keep
-    quot>> call ;
+: car-filter? ( lazy-filter -- ? )
+    [ cons>> car ] [ quot>> ] bi call ;
 
 : skip ( lazy-filter -- )
-    dup cons>> cdr >>cons ;
+    dup cons>> cdr >>cons drop ;
 
 M: lazy-filter car ( lazy-filter -- car )
     dup car-filter? [ cons>> ] [ dup skip ] if car ;
 
 M: lazy-filter cdr ( lazy-filter -- cdr )
     dup car-filter? [
-        [ cons>> cdr ] keep
-        quot>> lfilter
+        [ cons>> cdr ] [ quot>> ] bi lfilter
     ] [
         dup skip cdr
     ] if ;