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

Merge commit 'erg/master'

release
Slava Pestov 2007-11-25 17:03:42 -05:00
parent e4e79f2217 8d84a81141
commit 7925cf2266
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extra/parser-combinators/parser-combinators.factor
View File

@ -190,6 +190,10 @@ M: some-parser (parse) ( input parser -- result )
#! Same as <&> except flatten the result. #! Same as <&> except flatten the result.
<&> [ dup second swap first [ , % ] { } make ] <@ ; <&> [ dup second swap first [ , % ] { } make ] <@ ;
: <:&:> ( parser1 parser2 -- result )
#! Same as <&> except flatten the result.
<&> [ dup second swap first [ % % ] { } make ] <@ ;
LAZY: <*> ( parser -- parser ) LAZY: <*> ( parser -- parser )
dup <*> <&:> { } succeed <|> ; dup <*> <&:> { } succeed <|> ;
@ -263,4 +267,4 @@ LAZY: <(+)> ( parser -- parser )
nonempty-list-of { } succeed <|> ; nonempty-list-of { } succeed <|> ;
LAZY: surrounded-by ( parser start end -- parser' ) LAZY: surrounded-by ( parser start end -- parser' )
[ token ] 2apply swapd pack ; [ token ] 2apply swapd pack ;

6
extra/regexp/regexp.factor
View File

@ -1,6 +1,6 @@
USING: combinators kernel lazy-lists math math.parser USING: combinators kernel lazy-lists math math.parser
namespaces parser parser-combinators promises sequences namespaces parser parser-combinators parser-combinators.simple
strings ; promises sequences strings ;
USING: continuations io prettyprint ; USING: continuations io prettyprint ;
IN: regexp IN: regexp
@ -17,8 +17,6 @@ IN: regexp
: 'string' 'char' <+> [ >string token ] <@ ; : 'string' 'char' <+> [ >string token ] <@ ;
: 'integer' [ digit? ] satisfy <+> [ string>number ] <@ ;
: exactly-n ( parser n -- parser' ) : exactly-n ( parser n -- parser' )
swap <repetition> and-parser construct-boa ; swap <repetition> and-parser construct-boa ;