---

yaml
---
r: 31434
b: refs/heads/dist-snap
c: 5805616
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 94f29e0c9485e2867c6e48cdf74ff7ca1b764e4b
+refs/heads/dist-snap: 5805616aad056327c19831634708e90175f1a4a0
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/parse/common.rs

@@ -141,17 +141,18 @@ impl parser_common of parser_common for parser {
     fn eat_keyword(word: ~str) -> bool {
         self.require_keyword(word);
 
-        // FIXME (#13042): this gratuitous use of @ is to
-        // workaround LLVM bug.
-        alt @self.token {
-          @token::IDENT(sid, false) {
+        let mut bump = false;
+        let val = alt self.token {
+          token::IDENT(sid, false) {
             if str::eq(word, *self.get_str(sid)) {
-                self.bump();
-                ret true;
-            } else { ret false; }
+                bump = true;
+                true
+            } else { false }
           }
-          _ { ret false; }
-        }
+          _ { false }
+        };
+        if bump { self.bump() }
+        val
     }
 
     fn expect_keyword(word: ~str) {

branches/dist-snap/src/libsyntax/parse/lexer.rs

@@ -14,7 +14,7 @@ iface reader {
     fn next_token() -> {tok: token::token, sp: span};
     fn fatal(~str) -> !;
     fn span_diag() -> span_handler;
-    fn interner() -> @interner<@~str>;
+    pure fn interner() -> @interner<@~str>;
     fn peek() -> {tok: token::token, sp: span};
     fn dup() -> reader;
 }
@@ -79,7 +79,7 @@ impl string_reader_as_reader of reader for string_reader {
         self.span_diagnostic.span_fatal(copy self.peek_span, m)
     }
     fn span_diag() -> span_handler { self.span_diagnostic }
-    fn interner() -> @interner<@~str> { self.interner }
+    pure fn interner() -> @interner<@~str> { self.interner }
     fn peek() -> {tok: token::token, sp: span} {
         {tok: self.peek_tok, sp: self.peek_span}
     }
@@ -101,7 +101,7 @@ impl tt_reader_as_reader of reader for tt_reader {
         self.sp_diag.span_fatal(copy self.cur_span, m);
     }
     fn span_diag() -> span_handler { self.sp_diag }
-    fn interner() -> @interner<@~str> { self.interner }
+    pure fn interner() -> @interner<@~str> { self.interner }
     fn peek() -> {tok: token::token, sp: span} {
         { tok: self.cur_tok, sp: self.cur_span }
     }

branches/dist-snap/src/libsyntax/parse/parser.rs

@@ -223,7 +223,7 @@ class parser {
     fn warn(m: ~str) {
         self.sess.span_diagnostic.span_warn(copy self.span, m)
     }
-    fn get_str(i: token::str_num) -> @~str {
+    pure fn get_str(i: token::str_num) -> @~str {
         interner::get(*self.reader.interner(), i)
     }
     fn get_id() -> node_id { next_node_id(self.sess) }