From 7013a0d008d6d713ebee69abda152a191268e06e Mon Sep 17 00:00:00 2001 From: nomennescio Date: Sat, 7 Oct 2023 06:48:35 +0200 Subject: [PATCH] Refactor repeating,snipped using sequence-view --- extra/sequences/repeating/repeating.factor | 7 +------ extra/sequences/snipped/snipped.factor | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/extra/sequences/repeating/repeating.factor b/extra/sequences/repeating/repeating.factor index 3a66617bf4..71c0c5f7c9 100644 --- a/extra/sequences/repeating/repeating.factor +++ b/extra/sequences/repeating/repeating.factor @@ -27,8 +27,7 @@ M: cycles virtual-exemplar circular>> ; INSTANCE: cycles virtual-sequence -TUPLE: element-repeats -{ seq sequence read-only } +TUPLE: element-repeats < sequence-view { times integer read-only } ; C: element-repeats @@ -37,11 +36,7 @@ M: element-repeats length [ seq>> length ] [ times>> ] bi * ; M: element-repeats virtual@ [ times>> /i ] [ seq>> ] bi ; -M: element-repeats virtual-exemplar seq>> ; - INSTANCE: element-repeats immutable-sequence -INSTANCE: element-repeats virtual-sequence - : repeat-elements ( seq times -- new-seq ) dupd swap like ; diff --git a/extra/sequences/snipped/snipped.factor b/extra/sequences/snipped/snipped.factor index 40fdd93c12..b4adacf0b3 100644 --- a/extra/sequences/snipped/snipped.factor +++ b/extra/sequences/snipped/snipped.factor @@ -3,8 +3,7 @@ USING: accessors kernel math math.order sequences ; IN: sequences.snipped -TUPLE: snipped -{ seq sequence read-only } +TUPLE: snipped < sequence-view { from integer read-only } { length integer read-only } ; @@ -19,7 +18,3 @@ M: snipped length [ seq>> length ] [ length>> ] bi [-] ; M: snipped virtual@ [ [ from>> dupd >= ] keep [ length>> + ] curry when ] [ seq>> ] bi ; - -M: snipped virtual-exemplar seq>> ; - -INSTANCE: snipped virtual-sequence -- 2.34.1