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

Add stubs for ^ and $

release
Doug Coleman 2007-12-03 22:43:33 -06:00
parent 601c4fedcf
commit a5d450de63
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extra/regexp/regexp.factor
View File

@ -41,7 +41,7 @@ MACRO: fast-member? ( str -- quot )
dup alpha? swap punct? or ; dup alpha? swap punct? or ;
: 'ordinary-char' ( -- parser ) : 'ordinary-char' ( -- parser )
[ "\\^*+?|(){}[" fast-member? not ] satisfy [ "\\^*+?|(){}[$" fast-member? not ] satisfy
[ [ = ] curry ] <@ ; [ [ = ] curry ] <@ ;
: 'octal-digit' ( -- parser ) [ octal-digit? ] satisfy ; : 'octal-digit' ( -- parser ) [ octal-digit? ] satisfy ;
@ -185,7 +185,13 @@ C: <group-result> group-result
<+> [ <and-parser> ] <@ ; <+> [ <and-parser> ] <@ ;
LAZY: 'regexp' ( -- parser ) LAZY: 'regexp' ( -- parser )
'term' "|" token nonempty-list-of [ <or-parser> ] <@ ; 'term' "|" token nonempty-list-of [ <or-parser> ] <@
"^" token 'term' "|" token nonempty-list-of [ <or-parser> ] <@
&> [ "caret" print ] <@ <|>
'term' "|" token nonempty-list-of [ <or-parser> ] <@
"$" token <& [ "dollar" print ] <@ <|>
"^" token 'term' "|" token nonempty-list-of [ <or-parser> ] <@ &>
"$" token [ "caret dollar" print ] <@ <& <|> ;
TUPLE: regexp source parser ; TUPLE: regexp source parser ;