user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow type annotations for blocks

Browse source 
I.e. {|foo: int| -> int foo + 2}

Issue #1275
This commit is contained in:
Marijn Haverbeke 2011-12-09 09:42:09 +01:00
parent 54f72fbc10
commit 44ffd8e3aa
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/comp/syntax/parse/parser.rs
View file

@ -567,7 +567,8 @@ fn parse_arg(p: parser) -> ast::arg {
fn parse_fn_block_arg(p: parser) -> ast::arg {
let m = parse_arg_mode(p);
let i = parse_value_ident(p);
let t = @spanned(p.get_lo_pos(), p.get_hi_pos(), ast::ty_infer);
let t = eat(p, token::COLON) ? parse_ty(p, false) :
@spanned(p.get_lo_pos(), p.get_hi_pos(), ast::ty_infer);
ret {mode: m, ty: t, ident: i, id: p.get_id()};
}
@ -1747,16 +1748,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 =
if p.peek() == token::OROR {
p.bump();
[]
} else {
parse_seq(token::BINOP(token::OR), token::BINOP(token::OR),
seq_sep(token::COMMA), parse_fn_block_arg, p).node
};
let inputs = eat(p, token::OROR) ? [] :
parse_seq(token::BINOP(token::OR), token::BINOP(token::OR),
seq_sep(token::COMMA), parse_fn_block_arg, p).node;
let output = eat(p, token::RARROW) ? parse_ty(p, false) :
@spanned(p.get_lo_pos(), p.get_hi_pos(), ast::ty_infer);
ret {inputs: inputs,
output: @spanned(p.get_lo_pos(), p.get_hi_pos(), ast::ty_infer),
output: output,
purity: ast::impure_fn,
il: ast::il_normal,
cf: ast::return_val,

4
src/test/run-pass/block-explicit-types.rs Normal file
View file

@ -0,0 +1,4 @@
fn main() {
fn as_buf<T>(s: str, f: block(str) -> T) -> T { f(s) }
as_buf("foo", {|foo: str| -> () log_err foo;});
}