Add unsafe blocks, unsafe functions, and two rudimentary tests

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

View file

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

View file

@ -2165,7 +2165,8 @@ fn parse_item(p: parser, attrs: [ast::attribute]) -> option::t<@ast::item> {
let proto = parse_fn_proto(p); let proto = parse_fn_proto(p);
ret some(parse_item_fn_or_iter(p, ast::pure_fn, proto, attrs, ret some(parse_item_fn_or_iter(p, ast::pure_fn, proto, attrs,
ast::il_normal)); 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"); expect_word(p, "fn");
ret some(parse_item_fn_or_iter(p, ast::unsafe_fn, ast::proto_fn, ret some(parse_item_fn_or_iter(p, ast::unsafe_fn, ast::proto_fn,
attrs, ast::il_normal)); attrs, ast::il_normal));

View file

@ -15,7 +15,9 @@ native "rust" mod rustrt {
/// Reserves space for `n` elements in the given vector. /// Reserves space for `n` elements in the given vector.
fn reserve<@T>(&v: [mutable? T], n: uint) { fn reserve<@T>(&v: [mutable? T], n: uint) {
rustrt::vec_reserve_shared(v, n); //unsafe {
rustrt::vec_reserve_shared(v, n);
//}
} }
pure fn len<T>(v: [mutable? T]) -> uint { unchecked { rusti::vec_len(v) } } pure fn len<T>(v: [mutable? T]) -> uint { unchecked { rusti::vec_len(v) } }

View file

@ -0,0 +1,8 @@
// -*- rust -*-
// error-pattern: safe function calls function marked unsafe
unsafe fn f() { ret; }
fn main() {
f();
}

View file

@ -0,0 +1,11 @@
// -*- rust -*-
//
// See also: compile-fail/unsafe-fn-called-from-safe.rs
unsafe fn f() { ret; }
fn main() {
unsafe {
f();
}
}