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

regexps return a slice instead of a range now

db4
Doug Coleman 2008-11-22 17:30:16 -06:00
parent e110bac51a
commit 09969a5fc2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/regexp/regexp.factor
View File

@ -33,9 +33,9 @@ IN: regexp
: matches? ( string regexp -- ? ) : matches? ( string regexp -- ? )
dupd match dupd match
[ [ length ] [ length>> 1- ] bi* = ] [ drop f ] if* ; [ [ length ] bi@ = ] [ drop f ] if* ;
: match-head ( string regexp -- end/f ) match [ length>> 1- ] [ f ] if* ; : match-head ( string regexp -- end/f ) match [ length ] [ f ] if* ;
: match-at ( string m regexp -- n/f finished? ) : match-at ( string m regexp -- n/f finished? )
[ [

7
basis/regexp/traversal/traversal.factor
View File

@ -144,7 +144,10 @@ M: capture-group-off flag-action ( dfa-traverser flag -- )
[ increment-state do-match ] when* [ increment-state do-match ] when*
] unless ; ] unless ;
: return-match ( dfa-traverser -- interval/f ) : return-match ( dfa-traverser -- slice/f )
dup matches>> dup matches>>
[ drop f ] [ drop f ]
[ [ start-index>> ] [ peek ] bi* 1 <range> ] if-empty ; [
[ [ text>> ] [ start-index>> ] bi ]
[ peek ] bi* rot <slice>
] if-empty ;