libsyntax: change token_is_{word,keyword} to take &Token

This commit is contained in:
Erick Tryzelaar
2013-02-24 10:52:06 -08:00
parent 272c25e938
commit 752befe2a6
2 changed files with 22 additions and 22 deletions

View File

@@ -136,24 +136,24 @@ pub impl Parser {
}
}
fn token_is_word(word: &~str, tok: token::Token) -> bool {
match tok {
fn token_is_word(word: &~str, tok: &token::Token) -> bool {
match *tok {
token::IDENT(sid, false) => { *self.id_to_str(sid) == *word }
_ => { false }
}
}
fn token_is_keyword(word: &~str, ++tok: token::Token) -> bool {
fn token_is_keyword(word: &~str, tok: &token::Token) -> bool {
self.require_keyword(word);
self.token_is_word(word, tok)
}
fn is_keyword(word: &~str) -> bool {
self.token_is_keyword(word, *self.token)
self.token_is_keyword(word, &*self.token)
}
fn is_any_keyword(tok: token::Token) -> bool {
match tok {
fn is_any_keyword(tok: &token::Token) -> bool {
match *tok {
token::IDENT(sid, false) => {
self.keywords.contains_key(self.id_to_str(sid))
}