OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Accept {|| ... } for argument-less block syntax

Browse Source 
Closes #880
This commit is contained in:
Marijn Haverbeke 2011-09-12 11:46:40 +02:00
parent fc6b7c8b38
commit 3667137a41
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/comp/syntax/parse/parser.rs
View File

@ -826,7 +826,8 @@ fn parse_bottom_expr(p: parser) -> @ast::expr {
hi = p.get_hi_pos();
expect(p, token::RBRACE);
ex = ast::expr_rec(fields, base);
} else if p.peek() == token::BINOP(token::OR) {
} else if p.peek() == token::BINOP(token::OR) ||
p.peek() == token::OROR {
ret parse_fn_block_expr(p);
} else {
let blk = parse_block_tail(p, lo, ast::checked);
@ -1772,10 +1773,13 @@ fn parse_fn_decl(p: parser, purity: ast::purity, il: ast::inlineness) ->
}
fn parse_fn_block_decl(p: parser) -> ast::fn_decl {
let inputs: ast::spanned<[ast::arg]> =
let inputs = if p.peek() == token::OROR {
p.bump(); []
} else {
parse_seq(token::BINOP(token::OR), token::BINOP(token::OR),
some(token::COMMA), parse_fn_block_arg, p);
ret {inputs: inputs.node,
some(token::COMMA), parse_fn_block_arg, p).node
};
ret {inputs: inputs,
output: @spanned(p.get_lo_pos(), p.get_hi_pos(), ast::ty_infer),
purity: ast::impure_fn,
il: ast::il_normal,