From f6bd67ab465418921cc7291b29b6e5d06f89de54 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 12 Oct 2013 16:40:51 -0700 Subject: [PATCH] sequences.extras: adding change-last and change-last-unsafe. --- extra/pdf/layout/layout.factor | 6 ++---- extra/sequences/extras/extras.factor | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extra/pdf/layout/layout.factor b/extra/pdf/layout/layout.factor index d2177f63db..d509bca78f 100644 --- a/extra/pdf/layout/layout.factor +++ b/extra/pdf/layout/layout.factor @@ -4,7 +4,8 @@ USING: accessors assocs calendar combinators environment fonts formatting fry io io.streams.string kernel literals locals make math math.order math.ranges pdf.canvas pdf.values pdf.wrap -sequences sorting splitting ui.text xml.entities ; +sequences sequences.extras sorting splitting ui.text +xml.entities ; FROM: assocs => change-at ; FROM: sequences => change-nth ; FROM: pdf.canvas => draw-text ; @@ -245,9 +246,6 @@ M: table-row pdf-render ] [ 0 ] if* ] map nip ; -: change-last ( seq quot -- ) - [ drop length 1 - ] [ change-nth ] 2bi ; inline - :: max-col-widths ( canvas rows -- widths ) H{ } clone :> widths rows [ diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor index f620216c81..2e32021846 100644 --- a/extra/sequences/extras/extras.factor +++ b/extra/sequences/extras/extras.factor @@ -521,3 +521,9 @@ PRIVATE> : reject! ( ... seq quot: ( ... elt -- ... ? ) -- ... subseq ) [ not ] compose filter! ; inline + +: change-last ( seq quot -- ) + [ drop length 1 - ] [ change-nth ] 2bi ; inline + +: change-last-unsafe ( seq quot -- ) + [ drop length 1 - ] [ change-nth-unsafe ] 2bi ; inline -- 2.34.1