diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-02-24 10:52:06 -0800 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-02-25 23:15:22 -0800 |
| commit | 752befe2a6401108f27ff0141bdd73baac44c41c (patch) | |
| tree | 495e06e94bfc52ab0e36a757b0ebf0be5775b911 /src/libsyntax/parse/common.rs | |
| parent | 272c25e9383be490c5fc67cb09773fe2563ef3a7 (diff) | |
| download | rust-752befe2a6401108f27ff0141bdd73baac44c41c.tar.gz rust-752befe2a6401108f27ff0141bdd73baac44c41c.zip | |
libsyntax: change token_is_{word,keyword} to take &Token
Diffstat (limited to 'src/libsyntax/parse/common.rs')
| -rw-r--r-- | src/libsyntax/parse/common.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs index c7f029e9733..91abd804fb3 100644 --- a/src/libsyntax/parse/common.rs +++ b/src/libsyntax/parse/common.rs @@ -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)) } |
