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

moving things around

db4
Doug Coleman 2008-08-22 16:49:48 -05:00
parent d01598887d
commit a6970ecaf9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extra/regexp2/parser/parser.factor
View File

@ -12,8 +12,6 @@ FROM: math.ranges => [a,b] ;
MIXIN: node MIXIN: node
TUPLE: concatenation seq ; INSTANCE: concatenation node TUPLE: concatenation seq ; INSTANCE: concatenation node
TUPLE: alternation seq ; INSTANCE: alternation node TUPLE: alternation seq ; INSTANCE: alternation node
! !!!!!!!!
TUPLE: question term ; INSTANCE: question node
TUPLE: kleene-star term ; INSTANCE: kleene-star node TUPLE: kleene-star term ; INSTANCE: kleene-star node
! !!!!!!!! ! !!!!!!!!
@ -31,7 +29,7 @@ TUPLE: lookahead term ; INSTANCE: lookahead node
TUPLE: lookbehind term ; INSTANCE: lookbehind node TUPLE: lookbehind term ; INSTANCE: lookbehind node
TUPLE: capture-group term ; INSTANCE: capture-group node TUPLE: capture-group term ; INSTANCE: capture-group node
TUPLE: non-capture-group term ; INSTANCE: non-capture-group node TUPLE: non-capture-group term ; INSTANCE: non-capture-group node
TUPLE: independent-group term ; INSTANCE: independent-group node TUPLE: independent-group term ; INSTANCE: independent-group node ! atomic group
TUPLE: character-class-range from to ; INSTANCE: character-class-range node TUPLE: character-class-range from to ; INSTANCE: character-class-range node
SINGLETON: epsilon INSTANCE: epsilon node SINGLETON: epsilon INSTANCE: epsilon node
SINGLETON: any-char INSTANCE: any-char node SINGLETON: any-char INSTANCE: any-char node
@ -116,7 +114,6 @@ ERROR: unmatched-parentheses ;
: make-negative-lookbehind ( string -- ) : make-negative-lookbehind ( string -- )
<negation> lookbehind boa push-stack ; <negation> lookbehind boa push-stack ;
DEFER: nested-parse-regexp
: make-non-capturing-group ( string -- ) : make-non-capturing-group ( string -- )
non-capture-group boa push-stack ; non-capture-group boa push-stack ;
@ -150,6 +147,7 @@ DEFER: (parse-regexp)
ERROR: bad-special-group string ; ERROR: bad-special-group string ;
DEFER: nested-parse-regexp
: (parse-special-group) ( -- ) : (parse-special-group) ( -- )
read1 { read1 {
{ [ dup CHAR: : = ] { [ dup CHAR: : = ]