---

yaml
---
r: 12629
b: refs/heads/master
c: 7ee90cc
h: refs/heads/master
i:
  12627: e4b4401
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5a0c564817508604fcb738e15966f2d279139d8c
+refs/heads/master: 7ee90cc7be7b74fd8e63ef79a19844343ad1dd9c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/librustsyntax/parse/common.rs

@@ -58,15 +58,15 @@ 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)) }
           _ { false }
         };
 }
 
-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));
     }