From 1a952a1fdcf385a0298ec0354bc2bd93b2c74051 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 24 Oct 2017 17:05:23 -0700 Subject: [PATCH] combinators.smart: using each-from. --- basis/combinators/smart/smart.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/combinators/smart/smart.factor b/basis/combinators/smart/smart.factor index e633ce4d33..9102cfbc02 100644 --- a/basis/combinators/smart/smart.factor +++ b/basis/combinators/smart/smart.factor @@ -146,7 +146,7 @@ MACRO: smart-map-reduce ( map-reduce-quots -- quot ) [ keys ] [ [ [ ] concat-as ] [ ] map-as ] bi dup length dup '[ [ first _ cleave ] keep [ @ _ cleave-curry _ spread* ] - [ 1 ] 2dip setup-each (each-integer) + 1 each-from ] ; MACRO: smart-2reduce ( 2reduce-quots -- quot ) @@ -159,5 +159,5 @@ MACRO: smart-2map-reduce ( 2map-reduce-quots -- quot ) [ keys ] [ [ [ ] concat-as ] [ ] map-as ] bi dup length dup '[ [ [ first ] bi@ _ 2cleave ] 2keep [ @ _ [ cleave-curry ] [ cleave-curry ] bi _ spread* ] - [ 1 ] 3dip (2each) (each-integer) + 1 2each-from ] ;