bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: Rename is_word to is_keyword, etc.

Browse source
This commit is contained in:
Brian Anderson 2012-04-24 20:16:53 -07:00
parent 5a0c564817
commit 7ee90cc7be
2 changed files with 97 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustsyntax/parse/common.rs
View file

@ -58,7 +58,7 @@ fn require_keyword(p: parser, word: str) {
}
}
fn is_word(p: parser, word: str) -> bool {
fn is_keyword(p: parser, word: str) -> bool {
require_keyword(p, word);
ret alt p.token {
token::IDENT(sid, false) { str::eq(word, p.get_str(sid)) }
@ -66,7 +66,7 @@ fn is_word(p: parser, word: str) -> bool {
};
}
fn eat_word(p: parser, word: str) -> bool {
fn eat_keyword(p: parser, word: str) -> bool {
require_keyword(p, word);
alt p.token {
token::IDENT(sid, false) {
@ -79,9 +79,9 @@ fn eat_word(p: parser, word: str) -> bool {
}
}
fn expect_word(p: parser, word: str) {
fn expect_keyword(p: parser, word: str) {
require_keyword(p, word);
if !eat_word(p, word) {
if !eat_keyword(p, word) {
p.fatal("expecting " + word + ", found " +
token_to_str(p.reader, p.token));
}