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

Get regexp words to infer

db4
Slava Pestov 2008-11-17 21:42:59 -06:00
parent d6dd9ea2a3
commit 5c51d9fd2c
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/regexp/parser/parser.factor
View File

@ -137,7 +137,7 @@ ERROR: bad-special-group string ;
DEFER: (parse-regexp) DEFER: (parse-regexp)
: nested-parse-regexp ( token ? -- ) : nested-parse-regexp ( token ? -- )
[ push-stack (parse-regexp) pop-stack ] dip [ push-stack (parse-regexp) pop-stack ] dip
[ <negation> ] when pop-stack boa push-stack ; [ <negation> ] when pop-stack new swap >>term push-stack ;
! non-capturing groups ! non-capturing groups
: (parse-special-group) ( -- ) : (parse-special-group) ( -- )

3
basis/regexp/regexp-tests.factor
View File

@ -2,6 +2,9 @@ USING: regexp tools.test kernel sequences regexp.parser
regexp.traversal eval ; regexp.traversal eval ;
IN: regexp-tests IN: regexp-tests
\ <regexp> must-infer
\ matches? must-infer
[ f ] [ "b" "a*" <regexp> matches? ] unit-test [ f ] [ "b" "a*" <regexp> matches? ] unit-test
[ t ] [ "" "a*" <regexp> matches? ] unit-test [ t ] [ "" "a*" <regexp> matches? ] unit-test
[ t ] [ "a" "a*" <regexp> matches? ] unit-test [ t ] [ "a" "a*" <regexp> matches? ] unit-test

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

@ -107,7 +107,8 @@ M: capture-group-off flag-action ( dfa-traverser flag -- )
: increment-state ( dfa-traverser state -- dfa-traverser ) : increment-state ( dfa-traverser state -- dfa-traverser )
[ [
dup traverse-forward>> dup traverse-forward>>
[ 1+ ] [ 1- ] ? change-current-index [ [ 1+ ] change-current-index ]
[ [ 1- ] change-current-index ] if
dup current-state>> >>last-state dup current-state>> >>last-state
] dip ] dip
first >>current-state ; first >>current-state ;

4
basis/regexp/utils/utils-tests.factor Normal file
View File

@ -0,0 +1,4 @@
USING: regexp.utils tools.test ;
IN: regexp.utils.tests
[ [ ] [ ] while-changes ] must-infer

4
basis/regexp/utils/utils.factor
View File

@ -5,9 +5,7 @@ namespaces regexp.backend sequences unicode.categories
math.ranges fry combinators.short-circuit vectors ; math.ranges fry combinators.short-circuit vectors ;
IN: regexp.utils IN: regexp.utils
: (while-changes) ( obj quot pred pred-ret -- obj ) : (while-changes) ( obj quot: ( obj -- obj' ) pred: ( obj -- <=> ) pred-ret -- obj )
! quot: ( obj -- obj' )
! pred: ( obj -- <=> )
[ [ dup slip ] dip pick over call ] dip dupd = [ [ dup slip ] dip pick over call ] dip dupd =
[ 3drop ] [ (while-changes) ] if ; inline recursive [ 3drop ] [ (while-changes) ] if ; inline recursive