From 26b7b20622e3266ac47e63ebee6ee06cf9f7399a Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 23 Oct 2017 18:01:15 -0700 Subject: [PATCH] sequences: fix map-reduce to have ..a on the stack for the first call. --- core/sequences/sequences.factor | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index f0d5648f81..e6b56ad21f 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -1001,12 +1001,10 @@ PRIVATE> [ rest-slice ] [ first-unsafe ] bi ; inline : map-reduce ( ..a seq map-quot: ( ..a elt -- ..b intermediate ) reduce-quot: ( ..b prev intermediate -- ..a next ) -- ..a result ) - [ [ dup first ] dip [ call ] keep ] dip compose - swapd 1 each-from ; inline + [ [ [ first ] keep ] dip [ dip ] keep ] dip compose 1 each-from ; inline : 2map-reduce ( ..a seq1 seq2 map-quot: ( ..a elt1 elt2 -- ..b intermediate ) reduce-quot: ( ..b prev intermediate -- ..a next ) -- ..a result ) - [ [ 2dup [ first ] bi@ ] dip [ call ] keep ] dip compose - [ -rot ] dip 1 2each-from ; inline + [ [ [ [ first ] bi@ ] 2keep ] dip [ 2dip ] keep ] dip compose 1 2each-from ; inline