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

streamline cords, add a functor for making specialized cords

db4
Joe Groff 2009-11-24 23:18:01 -08:00
parent 46f0aa6421
commit d95c6eb4c8
2 changed files with 29 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
basis/sequences/cords/cords-tests.factor
View File

@ -2,4 +2,3 @@ USING: sequences.cords strings tools.test kernel sequences ;
IN: sequences.cords.tests IN: sequences.cords.tests
[ "hello world" ] [ "hello" " world" cord-append dup like ] unit-test [ "hello world" ] [ "hello" " world" cord-append dup like ] unit-test
[ "hello world" ] [ { "he" "llo" " world" } cord-concat dup like ] unit-test

87
basis/sequences/cords/cords.factor
View File

@ -1,72 +1,43 @@
! Copyright (C) 2008 Slava Pestov. ! Copyright (C) 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs sequences sorting binary-search math USING: accessors assocs sequences sorting binary-search math
math.order arrays combinators kernel ; math.order arrays classes combinators kernel functors ;
IN: sequences.cords IN: sequences.cords
<PRIVATE MIXIN: cord
TUPLE: simple-cord TUPLE: generic-cord
{ first read-only } { second read-only } ; { head read-only } { tail read-only } ;
INSTANCE: generic-cord cord
M: simple-cord length M: cord length
[ first>> length ] [ second>> length ] bi + ; inline [ head>> length ] [ tail>> length ] bi + ; inline
M: simple-cord virtual-exemplar first>> ; inline M: cord virtual-exemplar head>> ; inline
M: simple-cord virtual@ M: cord virtual@
2dup first>> length < 2dup head>> length <
[ first>> ] [ [ first>> length - ] [ second>> ] bi ] if ; inline [ head>> ] [ [ head>> length - ] [ tail>> ] bi ] if ; inline
TUPLE: multi-cord
{ count read-only } { seqs read-only } ;
M: multi-cord length count>> ; inline
M: multi-cord virtual@
dupd
seqs>> [ first <=> ] with search nip
[ first - ] [ second ] bi ; inline
M: multi-cord virtual-exemplar
seqs>> [ f ] [ first second ] if-empty ; inline
: <cord> ( seqs -- cord )
dup length 2 = [
first2 simple-cord boa
] [
[ 0 [ length + ] accumulate ] keep zip multi-cord boa
] if ; inline
PRIVATE>
UNION: cord simple-cord multi-cord ;
INSTANCE: cord virtual-sequence INSTANCE: cord virtual-sequence
INSTANCE: multi-cord virtual-sequence GENERIC: cord-append ( seq1 seq2 -- cord )
: cord-append ( seq1 seq2 -- cord ) M: object cord-append
{ generic-cord boa ; inline
{ [ over empty? ] [ nip ] }
{ [ dup empty? ] [ drop ] }
{ [ 2dup [ cord? ] both? ] [ [ seqs>> values ] bi@ append <cord> ] }
{ [ over cord? ] [ [ seqs>> values ] dip suffix <cord> ] }
{ [ dup cord? ] [ seqs>> values swap prefix <cord> ] }
[ 2array <cord> ]
} cond ; inline
: cord-concat ( seqs -- cord ) FUNCTOR: define-specialized-cord ( T C -- )
{
{ [ dup empty? ] [ drop f ] } T-cord DEFINES-CLASS ${C}
{ [ dup length 1 = ] [ first ] }
[ WHERE
[
{ TUPLE: T-cord
{ [ dup cord? ] [ seqs>> values ] } { head T read-only } { tail T read-only } ;
{ [ dup empty? ] [ drop { } ] } INSTANCE: T-cord cord
[ 1array ]
} cond M: T cord-append
] map concat <cord> 2dup [ T instance? ] both?
] [ T-cord boa ] [ generic-cord boa ] if ; inline
} cond ; inline
;FUNCTOR