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

lambda: fix for parser combinator changes

darcs
chris.double 2006-10-08 11:41:42 +00:00
parent da69cc1271
commit 0cdd57f2a9
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/lambda/parser.factor
View File

@ -6,41 +6,41 @@
#! <expr> ::= (<expr> <expr>) #! <expr> ::= (<expr> <expr>)
#! <line> ::= <expr> #! <line> ::= <expr>
#! <line> ::= <name> : <expr> #! <line> ::= <name> : <expr>
USING: parser-combinators strings sequences kernel ; USING: lazy-lists parser-combinators strings sequences kernel ;
IN: lambda IN: lambda
: <letter> LAZY: <letter>
#! parses an uppercase or lowercase letter #! parses an uppercase or lowercase letter
[ letter? ] satisfy [ ch>string ] <@ ; [ letter? ] satisfy [ ch>string ] <@ ;
: <LETTER> LAZY: <LETTER>
#! parses an uppercase or lowercase letter #! parses an uppercase or lowercase letter
[ LETTER? ] satisfy [ ch>string ] <@ ; [ LETTER? ] satisfy [ ch>string ] <@ ;
: <number> LAZY: <number>
#! parses a number #! parses a number
[ digit? ] satisfy [ ch>string ] <@ ; [ digit? ] satisfy [ ch>string ] <@ ;
: <alphanumeric> LAZY: <alphanumeric>
#! parses an alphanumeral #! parses an alphanumeral
<letter> <number> <|> ; <letter> <number> <|> ;
: <ALPHANUMERIC> LAZY: <ALPHANUMERIC>
#! parses an alphanumeral #! parses an alphanumeral
<LETTER> <number> <|> ; <LETTER> <number> <|> ;
: <id> LAZY: <id>
#! parses an identifier (string for now) #! parses an identifier (string for now)
#! TODO: do we need to enter it into a symbol table? #! TODO: do we need to enter it into a symbol table?
<letter> <alphanumeric> <*> <&:> [ concat <var-node> ] <@ ; <letter> <alphanumeric> <*> <&:> [ concat <var-node> ] <@ ;
: <name> LAZY: <name>
#! parses a name, which is used in replacement #! parses a name, which is used in replacement
<ALPHANUMERIC> <+> [ concat ] <@ ; <ALPHANUMERIC> <+> [ concat ] <@ ;
DEFER: <expr> DEFER: <expr>
: <lambda> LAZY: <lambda> ( -- parser )
#! parses (<id>.<expr>), the "lambda" expression #! parses (<id>.<expr>), the "lambda" expression
#! all occurences of <id> are replaced with a pointer to this #! all occurences of <id> are replaced with a pointer to this
#! lambda expression. #! lambda expression.
@ -48,23 +48,23 @@ DEFER: <expr>
<expr> sp <&> ")" token sp <& <expr> sp <&> ")" token sp <&
[ [ first var-node-name ] keep second <lambda-node> ] <@ ; [ [ first var-node-name ] keep second <lambda-node> ] <@ ;
: <apply> LAZY: <apply> ( -- parser )
#! parses (<expr> <expr>), the function application #! parses (<expr> <expr>), the function application
"(" token <expr> sp &> <expr> sp <&> ")" token sp <& "(" token <expr> sp &> <expr> sp <&> ")" token sp <&
[ [ first ] keep second <apply-node> ] <@ ; [ [ first ] keep second <apply-node> ] <@ ;
: <alien> LAZY: <alien> ( -- parser )
#! parses [<FACTOR-WORD>], the alien invocation #! parses [<FACTOR-WORD>], the alien invocation
#! an alien factor word must be all capital letters and numerals #! an alien factor word must be all capital letters and numerals
"[" token <name> sp &> "]" token sp <& [ <alien-node> ] <@ ; "[" token <name> sp &> "]" token sp <& [ <alien-node> ] <@ ;
: <expr> LAZY: <expr>
[ <id> call ] [ <lambda> call ] [ <apply> call ] <|> <|> <id> <lambda> <apply> <|> <|>
<name> [ <var-node> ] <@ <|> <alien> <|> ; <name> [ <var-node> ] <@ <|> <alien> <|> ;
: <line> LAZY: <line>
":" token <name> &> <expr> sp <&> f succeed <expr> <&> ":" token <name> &> <expr> sp <&> f succeed <expr> <&>
<|> "." token <name> &> f succeed <&> <|> ; <|> "." token <name> &> f succeed <&> <|> ;
: lambda-parse : lambda-parse
<line> some call ; <line> some parse force ;