rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

finish removing parse_value_ident

Browse Source
This commit is contained in:
John Clements
2013-03-06 09:30:54 -08:00
parent 88451878f8
commit 8bb537e68d
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libsyntax/parse/parser.rs
View File

@@ -457,7 +457,7 @@ pub impl Parser {
let pur = p.parse_fn_purity();
// NB: at the moment, trait methods are public by default; this
// could change.
let ident = p.parse_method_name();
let ident = p.parse_ident();
let generics = p.parse_generics();
@@ -2102,11 +2102,7 @@ pub impl Parser {
}
let lo1 = self.last_span.lo;
let fieldname = if self.look_ahead(1u) == token::COLON {
self.parse_ident()
} else {
self.parse_value_ident()
};
let fieldname = self.parse_ident();
let hi1 = self.last_span.lo;
let fieldpath = ast_util::ident_to_path(mk_sp(lo1, hi1),
fieldname);
@@ -2946,7 +2942,7 @@ pub impl Parser {
}
fn parse_fn_header(&self) -> (ident, ast::Generics) {
let id = self.parse_value_ident();
let id = self.parse_ident();
let generics = self.parse_generics();
(id, generics)
}
@@ -2969,10 +2965,6 @@ pub impl Parser {
(ident, item_fn(decl, purity, generics, body), Some(inner_attrs))
}
fn parse_method_name(&self) -> ident {
self.parse_value_ident()
}
fn parse_method(&self) -> @method {
let attrs = self.parse_outer_attributes();
let lo = self.span.lo;
@@ -2982,7 +2974,7 @@ pub impl Parser {
let visa = self.parse_visibility();
let pur = self.parse_fn_purity();
let ident = self.parse_method_name();
let ident = self.parse_ident();
let generics = self.parse_generics();
let (self_ty, decl) = do self.parse_fn_decl_with_self() |p| {
p.parse_arg()
@@ -3106,7 +3098,7 @@ pub impl Parser {
}
fn parse_item_struct(&self) -> item_info {
let class_name = self.parse_value_ident();
let class_name = self.parse_ident();
self.parse_region_param();
let generics = self.parse_generics();
if self.eat(&token::COLON) {
@@ -3334,7 +3326,7 @@ pub impl Parser {
}
fn parse_item_const(&self) -> item_info {
let id = self.parse_value_ident();
let id = self.parse_ident();
self.expect(&token::COLON);
let ty = self.parse_ty(false);
self.expect(&token::EQ);
@@ -3732,7 +3724,7 @@ pub impl Parser {
kind = enum_variant_kind(nested_enum_def);
needs_comma = false;
} else {
ident = self.parse_value_ident();
ident = self.parse_ident();
if self.eat(&token::LBRACE) {
// Parse a struct variant.
all_nullary = false;