From 608bedd2088de0e8d911d844775ace0099599129 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Thu, 27 Sep 2012 11:14:21 -0700 Subject: [PATCH] sequences: change stack effect docs for map-reduce to be more consistent. --- core/sequences/sequences-docs.factor | 2 +- core/sequences/sequences.factor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor index 84522ec46a..4000802a9b 100644 --- a/core/sequences/sequences-docs.factor +++ b/core/sequences/sequences-docs.factor @@ -1344,7 +1344,7 @@ HELP: insert-nth HELP: map-reduce { $values - { "seq" sequence } { "map-quot" { $quotation "( ..a x -- ..b elt )" } } { "reduce-quot" { $quotation "( ..b prev elt -- ..a next )" } } + { "seq" sequence } { "map-quot" { $quotation "( ..a elt -- ..b intermediate )" } } { "reduce-quot" { $quotation "( ..b prev intermediate -- ..a next )" } } { "result" object } } { $description "Calls " { $snippet "map-quot" } " on each element and combines the results using " { $snippet "reduce-quot" } " in the same manner as " { $link reduce } ", except that there is no identity element, and the sequence must have a length of at least 1." } { $errors "Throws an error if the sequence is empty." } diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 3327bdd701..76b55928ee 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -924,7 +924,7 @@ PRIVATE> : unclip-slice ( seq -- rest-slice first ) [ rest-slice ] [ first-unsafe ] bi ; inline -: map-reduce ( ..a seq map-quot: ( ..a x -- ..b elt ) reduce-quot: ( ..b prev elt -- ..a next ) -- ..a result ) +: 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 ] 2dip (each) (each-integer) ; inline -- 2.34.1