bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Implement original version of RFC#1245

Browse source
This commit is contained in:
John Hodge 2015-10-03 23:42:22 +08:00
parent 0369304feb
commit 4c88bf2885
3 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libsyntax/parse/parser.rs
View file

@ -4380,11 +4380,11 @@ impl<'a> Parser<'a> {
/// - `extern fn`
/// - etc
pub fn parse_fn_front_matter(&mut self) -> PResult<(ast::Constness, ast::Unsafety, abi::Abi)> {
let unsafety = try!(self.parse_unsafety());
let is_const_fn = try!(self.eat_keyword(keywords::Const));
let (constness, unsafety, abi) = if is_const_fn {
(Constness::Const, Unsafety::Normal, abi::Rust)
(Constness::Const, unsafety, abi::Rust)
} else {
let unsafety = try!(self.parse_unsafety());
let abi = if try!(self.eat_keyword(keywords::Extern)) {
try!(self.parse_opt_abi()).unwrap_or(abi::C)
} else {
@ -5399,9 +5399,14 @@ impl<'a> Parser<'a> {
} else {
abi::Rust
};
let constness = if abi == abi::Rust && try!(self.eat_keyword(keywords::Const) ){
Constness::Const
} else {
Constness::NotConst
};
try!(self.expect_keyword(keywords::Fn));
let (ident, item_, extra_attrs) =
try!(self.parse_item_fn(Unsafety::Unsafe, Constness::NotConst, abi));
try!(self.parse_item_fn(Unsafety::Unsafe, constness, abi));
let last_span = self.last_span;
let item = self.mk_item(lo,
last_span.hi,