steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sequences: integer length for repetition, use English.

db4
John Benediktsson 2015-07-17 17:42:41 -07:00
parent 8d4d0d356f
commit fb688cc08b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/sequences/sequences.factor
View File

@ -261,13 +261,15 @@ M: slice length [ to>> ] [ from>> ] bi - ; inline
INSTANCE: slice virtual-sequence
! One element repeated many times
TUPLE: repetition { len read-only } { elt read-only } ;
TUPLE: repetition
{ length integer read-only }
{ elt read-only } ;
: <repetition> ( len elt -- repetition )
over 0 < [ non-negative-integer-expected ] when
repetition boa ; inline
M: repetition length len>> ; inline
M: repetition length length>> ; inline
M: repetition nth-unsafe nip elt>> ; inline
INSTANCE: repetition immutable-sequence
@ -841,7 +843,7 @@ M: object sum-lengths
0 [ length + ] reduce ;
M: repetition sum-lengths
[ len>> ] [ elt>> length ] bi * ;
[ length>> ] [ elt>> length ] bi * ;
: concat-as ( seq exemplar -- newseq )
[
@ -1038,7 +1040,7 @@ PRIVATE>
GENERIC: sum ( seq -- n )
M: object sum 0 [ + ] binary-reduce ; inline
M: iota-tuple sum length dup 1 - * 2/ ; inline
M: repetition sum [ elt>> ] [ len>> ] bi * ; inline
M: repetition sum [ elt>> ] [ length>> ] bi * ; inline
: product ( seq -- n ) 1 [ * ] binary-reduce ;