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

Add unsafe blocks, unsafe functions, and two rudimentary tests

Browse source 
related to them
This commit is contained in:
Niko Matsakis 2011-10-06 21:33:04 -07:00 • committed by Brian Anderson
parent 29584cc5ac
commit 046ca827dd
5 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/comp/middle/typeck.rs
View file

@ -1552,10 +1552,12 @@ fn require_pure_call(ccx: @crate_ctxt, caller_purity: ast::purity,
ccx.tcx.sess.span_fatal
(sp, "safe function calls function marked unsafe");
}
//some(ast::def_native_fn(_)) {
// ccx.tcx.sess.span_fatal
// (sp, "native functions can only be invoked from unsafe code");
//}
/* Temporarily disable until unsafe blocks parse!
some(ast::def_native_fn(_)) {
ccx.tcx.sess.span_fatal
(sp, "native functions can only be invoked from unsafe code");
}
*/
_ {
}
}

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

@ -2165,7 +2165,8 @@ fn parse_item(p: parser, attrs: [ast::attribute]) -> option::t<@ast::item> {
let proto = parse_fn_proto(p);
ret some(parse_item_fn_or_iter(p, ast::pure_fn, proto, attrs,
ast::il_normal));
} else if eat_word(p, "unsafe") {
} else if is_word(p, "unsafe") && p.look_ahead(1u) != token::LBRACE {
p.bump();
expect_word(p, "fn");
ret some(parse_item_fn_or_iter(p, ast::unsafe_fn, ast::proto_fn,
attrs, ast::il_normal));