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

clean up some stack shuffling

db4
Doug Coleman 2009-05-31 08:53:42 -05:00
parent 802283c94c
commit ae75b41a43
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
extra/cursors/cursors.factor
View File

@ -12,31 +12,32 @@ GENERIC: cursor-write ( obj cursor -- )
ERROR: cursor-ended cursor ; ERROR: cursor-ended cursor ;
: cursor-get ( cursor -- obj ) : cursor-get ( cursor -- obj )
dup cursor-done? dup cursor-done?
[ cursor-ended ] [ cursor-get-unsafe ] if ; inline [ cursor-ended ] [ cursor-get-unsafe ] if ; inline
: find-done? ( quot cursor -- ? ) : find-done? ( cursor quot -- ? )
dup cursor-done? [ 2drop t ] [ cursor-get-unsafe swap call ] if ; inline over cursor-done?
[ 2drop t ] [ [ cursor-get-unsafe ] dip call ] if ; inline
: cursor-until ( quot cursor -- ) : cursor-until ( cursor quot -- )
[ find-done? not ] [ find-done? not ]
[ cursor-advance drop ] bi-curry bi-curry while ; inline [ drop cursor-advance ] bi-curry bi-curry while ; inline
: cursor-each ( cursor quot -- ) : cursor-each ( cursor quot -- )
[ f ] compose swap cursor-until ; inline [ f ] compose cursor-until ; inline
: cursor-find ( cursor quot -- obj ? ) : cursor-find ( cursor quot -- obj ? )
swap [ cursor-until ] keep [ cursor-until ] [ drop ] 2bi
dup cursor-done? [ drop f f ] [ cursor-get t ] if ; inline dup cursor-done? [ drop f f ] [ cursor-get t ] if ; inline
: cursor-any? ( cursor quot -- ? ) : cursor-any? ( cursor quot -- ? )
cursor-find nip ; inline cursor-find nip ; inline
: cursor-all? ( cursor quot -- ? ) : cursor-all? ( cursor quot -- ? )
[ not ] compose cursor-any? not ; inline [ not ] compose cursor-any? not ; inline
: cursor-map-quot ( quot to -- quot' ) : cursor-map-quot ( quot to -- quot' )
[ [ call ] dip cursor-write ] 2curry ; inline [ [ call ] dip cursor-write ] 2curry ; inline
: cursor-map ( from to quot -- ) : cursor-map ( from to quot -- )
swap cursor-map-quot cursor-each ; inline swap cursor-map-quot cursor-each ; inline
@ -46,10 +47,10 @@ ERROR: cursor-ended cursor ;
[ cursor-write ] 2curry when ; inline [ cursor-write ] 2curry when ; inline
: cursor-filter-quot ( quot to -- quot' ) : cursor-filter-quot ( quot to -- quot' )
[ cursor-write-if ] 2curry ; inline [ cursor-write-if ] 2curry ; inline
: cursor-filter ( from to quot -- ) : cursor-filter ( from to quot -- )
swap cursor-filter-quot cursor-each ; inline swap cursor-filter-quot cursor-each ; inline
TUPLE: from-sequence { seq sequence } { n integer } ; TUPLE: from-sequence { seq sequence } { n integer } ;
@ -60,19 +61,19 @@ M: from-sequence cursor-done? ( cursor -- ? )
>from-sequence< length >= ; >from-sequence< length >= ;
M: from-sequence cursor-valid? M: from-sequence cursor-valid?
>from-sequence< bounds-check? not ; >from-sequence< bounds-check? not ;
M: from-sequence cursor-get-unsafe M: from-sequence cursor-get-unsafe
>from-sequence< nth-unsafe ; >from-sequence< nth-unsafe ;
M: from-sequence cursor-advance M: from-sequence cursor-advance
[ 1+ ] change-n drop ; [ 1+ ] change-n drop ;
: >input ( seq -- cursor ) : >input ( seq -- cursor )
0 from-sequence boa ; inline 0 from-sequence boa ; inline
: iterate ( seq quot iterator -- ) : iterate ( seq quot iterator -- )
[ >input ] 2dip call ; inline [ >input ] 2dip call ; inline
: each ( seq quot -- ) [ cursor-each ] iterate ; inline : each ( seq quot -- ) [ cursor-each ] iterate ; inline
: find ( seq quot -- ? ) [ cursor-find ] iterate ; inline : find ( seq quot -- ? ) [ cursor-find ] iterate ; inline
@ -82,18 +83,19 @@ M: from-sequence cursor-advance
TUPLE: to-sequence { seq sequence } { exemplar sequence } ; TUPLE: to-sequence { seq sequence } { exemplar sequence } ;
M: to-sequence cursor-write M: to-sequence cursor-write
seq>> push ; seq>> push ;
: freeze ( cursor -- seq ) : freeze ( cursor -- seq )
[ seq>> ] [ exemplar>> ] bi like ; inline [ seq>> ] [ exemplar>> ] bi like ; inline
: >output ( seq -- cursor ) : >output ( seq -- cursor )
[ [ length ] keep new-resizable ] keep [ [ length ] keep new-resizable ] keep
to-sequence boa ; inline to-sequence boa ; inline
: transform ( seq quot transformer -- newseq ) : transform ( seq quot transformer -- newseq )
[ [ >input ] [ >output ] bi ] 2dip [ [ >input ] [ >output ] bi ] 2dip
[ call ] [ 2drop freeze ] 3bi ; inline [ call ]
[ 2drop freeze ] 3bi ; inline
: map ( seq quot -- ) [ cursor-map ] transform ; inline : map ( seq quot -- ) [ cursor-map ] transform ; inline
: filter ( seq quot -- newseq ) [ cursor-filter ] transform ; inline : filter ( seq quot -- newseq ) [ cursor-filter ] transform ; inline