bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

s/parse_purity/parse_unsafety

Browse source
This commit is contained in:
John Clements 2013-04-19 15:48:02 -07:00
parent 1abc1be81a
commit d2aee7b3e6
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -367,7 +367,7 @@ pub impl Parser {
let opt_abis = self.parse_opt_abis(); let opt_abis = self.parse_opt_abis();
let abis = opt_abis.get_or_default(AbiSet::Rust()); let abis = opt_abis.get_or_default(AbiSet::Rust());
let purity = self.parse_purity(); let purity = self.parse_unsafety();
self.expect_keyword(&~"fn"); self.expect_keyword(&~"fn");
let (decl, lifetimes) = self.parse_ty_fn_decl(); let (decl, lifetimes) = self.parse_ty_fn_decl();
return ty_bare_fn(@TyBareFn { return ty_bare_fn(@TyBareFn {
@ -401,7 +401,7 @@ pub impl Parser {
// At this point, the allocation type and lifetime bound have been // At this point, the allocation type and lifetime bound have been
// parsed. // parsed.
let purity = self.parse_purity(); let purity = self.parse_unsafety();
let onceness = parse_onceness(self); let onceness = parse_onceness(self);
self.expect_keyword(&~"fn"); self.expect_keyword(&~"fn");
@ -426,7 +426,8 @@ pub impl Parser {
} }
} }
fn parse_purity(&self) -> purity { // looks like this should be called parse_unsafety
fn parse_unsafety(&self) -> purity {
if self.eat_keyword(&~"pure") { if self.eat_keyword(&~"pure") {
self.obsolete(*self.last_span, ObsoletePurity); self.obsolete(*self.last_span, ObsoletePurity);
return impure_fn; return impure_fn;