mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treat fn*() as fn&()

Browse Source 
This is not my ideal way of going about things.  I'd prefer not
to have expressions typed as fn*(), for example, but I couldn't
get that to work together with inferring the modes of arguments
and other corner cases.
This commit is contained in:
Niko Matsakis 2012-01-18 12:04:07 -08:00
parent d54cc1cad4
commit 1f0b3d2247
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/comp/middle/shape.rs
View File

@ -432,7 +432,8 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t, ty_param_map: [uint]) -> [u8] {
ty::ty_fn({proto: ast::proto_uniq, _}) {
s += [shape_uniq_fn];
}
ty::ty_fn({proto: ast::proto_block, _}) {
ty::ty_fn({proto: ast::proto_block, _}) |
ty::ty_fn({proto: ast::proto_any, _}) {
s += [shape_stack_fn];
}
ty::ty_fn({proto: ast::proto_bare, _}) {

3
src/comp/middle/trans_closure.rs
View File

@ -528,8 +528,7 @@ fn trans_expr_fn(bcx: @block_ctxt,
};
let closure = alt proto {
ast::proto_any { fail "proto_any cannot appear in an expr"; }
ast::proto_block { trans_closure_env(ty::ck_block) }
ast::proto_any | ast::proto_block { trans_closure_env(ty::ck_block) }
ast::proto_box { trans_closure_env(ty::ck_box) }
ast::proto_uniq { trans_closure_env(ty::ck_uniq) }
ast::proto_bare {

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

@ -146,8 +146,8 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
for word in ["mod", "if", "else", "while", "do", "alt", "for", "break",
"cont", "ret", "be", "fail", "type", "resource", "check",
"assert", "claim", "native", "fn", "pure",
"unsafe", "block", "import", "export", "let", "const",
"log", "copy", "sendfn", "impl", "iface", "enum"] {
"unsafe", "import", "export", "let", "const",
"log", "copy", "impl", "iface", "enum"] {
words.insert(word, ());
}
words
@ -493,9 +493,6 @@ fn parse_ty(p: parser, colons_before_params: bool) -> @ast::ty {
_ { /* fallthrough */ }
}
t = parse_ty_fn(proto, p);
} else if eat_word(p, "block") {
//p.warn("block is deprecated, use fn& or fn");
t = parse_ty_fn(ast::proto_block, p);
} else if eat_word(p, "native") {
expect_word(p, "fn");
t = parse_ty_fn(ast::proto_bare, p);
@ -802,9 +799,6 @@ fn parse_bottom_expr(p: parser) -> pexpr {
_ { /* fallthrough */ }
}
ret pexpr(parse_fn_expr(p, proto));
} else if eat_word(p, "block") {
p.warn("block is deprecated, use fn& or fn");
ret pexpr(parse_fn_expr(p, ast::proto_block));
} else if eat_word(p, "unchecked") {
ret pexpr(parse_block_expr(p, lo, ast::unchecked_blk));
} else if eat_word(p, "unsafe") {

8
src/test/run-pass/block-arg-used-as-any.rs Normal file
View File

@ -0,0 +1,8 @@
fn call_any(f: fn*() -> uint) -> uint {
ret f();
}
fn main() {
let x_r = call_any {|| 22u };
assert x_r == 22u;
}