From 47b96f6891f2aa31c9cd7d6264fc292fdb55e168 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 12 Mar 2014 07:18:12 -0700 Subject: [PATCH] Revert "sequences: require integers for slice and repetition." This reverts commit 5e87cdb3a9b5885c6648ffaf6e5e9a2edc5fd200. --- core/sequences/sequences-docs.factor | 2 +- core/sequences/sequences.factor | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/sequences/sequences-docs.factor b/core/sequences/sequences-docs.factor index 108806f08d..ad0d557637 100644 --- a/core/sequences/sequences-docs.factor +++ b/core/sequences/sequences-docs.factor @@ -1120,7 +1120,7 @@ HELP: trim-tail-slice { $examples { $example "USING: prettyprint math sequences ;" "{ 0 0 1 2 3 0 0 } [ zero? ] trim-tail-slice ." - "T{ slice { to 5 } { seq { 0 0 1 2 3 0 0 } } }" + "T{ slice { from 0 } { to 5 } { seq { 0 0 1 2 3 0 0 } } }" } } ; diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor index 62b5e840f2..2662c6c720 100644 --- a/core/sequences/sequences.factor +++ b/core/sequences/sequences.factor @@ -214,8 +214,8 @@ INSTANCE: reversed virtual-sequence ! A slice of another sequence. TUPLE: slice -{ from integer read-only } -{ to integer read-only } +{ from read-only } +{ to read-only } { seq read-only } ; : collapse-slice ( m n slice -- m' n' seq ) @@ -266,7 +266,7 @@ M: slice length [ to>> ] [ from>> ] bi - ; inline INSTANCE: slice virtual-sequence ! One element repeated many times -TUPLE: repetition { len integer read-only } { elt read-only } ; +TUPLE: repetition { len read-only } { elt read-only } ; : ( len elt -- repetition ) over 0 < [ non-negative-integer-expected ] when -- 2.34.1