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

Refactoring next-match

db4
Daniel Ehrenberg 2009-03-11 14:45:52 -05:00
parent ed30d24e56
commit 642b5f9649
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
basis/regexp/regexp.factor
View File

@ -56,23 +56,33 @@ PRIVATE>
<PRIVATE <PRIVATE
: make-slice ( i j seq -- slice ) TUPLE: match { i read-only } { j read-only } { seq read-only } ;
[ 2dup > [ swap [ 1+ ] bi@ ] when ] dip <slice> ; inline
: match-slice ( i string quot -- slice/f ) : match-slice ( i string quot -- match/f )
[ 2dup ] dip call [ 2dup ] dip call
[ swap make-slice ] [ 2drop f ] if* ; inline [ swap match boa ] [ 2drop f ] if* ; inline
: search-range ( i string reverse? -- seq ) : search-range ( i string reverse? -- seq )
[ drop 0 [a,b] ] [ length [a,b) ] if ; inline [ drop 0 [a,b] ] [ length [a,b) ] if ; inline
:: next-match ( i string quot reverse? -- i slice/f ) : match>result ( match reverse? -- i start end string )
over [
[ [ i>> ] [ j>> tuck ] [ seq>> ] tri ] dip
[ [ swap [ 1+ ] bi@ ] dip ] when
] [ 2drop f f f f ] if ; inline
:: next-match ( i string quot reverse? -- i start end string )
i string reverse? search-range i string reverse? search-range
[ string quot match-slice ] map-find drop [ string quot match-slice ] map-find drop
[ dup [ reverse? [ from>> ] [ to>> ] if ] when ] keep ; inline reverse? match>result ; inline
: do-next-match ( i string regexp -- i match/f ) : do-next-match ( i string regexp -- i start end string )
dup next-match>> execute( i string regexp -- i match/f ) ; inline dup next-match>>
execute( i string regexp -- i start end string ) ;
: next-slice ( i string regexp -- i/f slice/f )
do-next-match
[ slice boa ] [ drop ] if* ; inline
PRIVATE> PRIVATE>
@ -84,7 +94,7 @@ TUPLE: match-iterator
: iterate ( iterator -- iterator'/f ) : iterate ( iterator -- iterator'/f )
dup dup
[ i>> ] [ string>> ] [ regexp>> ] tri do-next-match [ i>> ] [ string>> ] [ regexp>> ] tri next-slice
[ [ [ string>> ] [ regexp>> ] bi ] 2dip match-iterator boa ] [ [ [ string>> ] [ regexp>> ] bi ] 2dip match-iterator boa ]
[ 2drop f ] if* ; [ 2drop f ] if* ;
@ -149,22 +159,20 @@ M: regexp compile-regexp ( regexp -- regexp )
M: reverse-regexp compile-regexp ( regexp -- regexp ) M: reverse-regexp compile-regexp ( regexp -- regexp )
t backwards? [ do-compile-regexp ] with-variable ; t backwards? [ do-compile-regexp ] with-variable ;
GENERIC: compile-next-match ( regexp -- regexp ) DEFER: compile-next-match
: next-initial-word ( i string regexp -- i slice/f ) : next-initial-word ( i string regexp -- i start end string )
compile-next-match do-next-match ; compile-next-match do-next-match ;
M: regexp compile-next-match ( regexp -- regexp ) : compile-next-match ( regexp -- regexp )
dup '[ dup '[
dup \ next-initial-word = [ dup \ next-initial-word = [
drop _ [ compile-regexp dfa>> ] [ reverse-regexp? ] bi drop _ [ compile-regexp dfa>> ] [ reverse-regexp? ] bi
'[ _ '[ _ _ execute ] _ next-match ] '[ _ '[ _ _ execute ] _ next-match ]
(( i string regexp -- i match/f )) simple-define-temp (( i string regexp -- i start end string )) simple-define-temp
] when ] when
] change-next-match ; ] change-next-match ;
! Write M: reverse-regexp compile-next-match
PRIVATE> PRIVATE>
: new-regexp ( string ast options class -- regexp ) : new-regexp ( string ast options class -- regexp )