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

get rid of keyword idents, replace with names

Browse source 
should prevent future bugs
This commit is contained in:
John Clements 2014-07-06 15:19:29 -07:00
parent 06b64345d6
commit c1b8b3c35c
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -542,7 +542,7 @@ impl<'a> Parser<'a> {
// true. Otherwise, return false.
pub fn eat_keyword(&mut self, kw: keywords::Keyword) -> bool {
match self.token {
token::IDENT(sid, false) if kw.to_ident().name == sid.name => {
token::IDENT(sid, false) if kw.to_name() == sid.name => {
self.bump();
true
}
@ -555,7 +555,7 @@ impl<'a> Parser<'a> {
// otherwise, eat it.
pub fn expect_keyword(&mut self, kw: keywords::Keyword) {
if !self.eat_keyword(kw) {
let id_interned_str = token::get_ident(kw.to_ident());
let id_interned_str = token::get_name(kw.to_name());
let token_str = self.this_token_to_string();
self.fatal(format!("expected `{}`, found `{}`",
id_interned_str, token_str).as_slice())