---

yaml
---
r: 36365
b: refs/heads/try2
c: a41903d
h: refs/heads/master
i:
  36363: 55fc780
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5e4ed709cba6bf0d6df3b50b86c12cd59cf4f842
+refs/heads/try2: a41903d234e21bf1a4616f6f5da83a0122c41092
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libsyntax/parse/lexer.rs

@@ -145,6 +145,7 @@ fn bump(rdr: string_reader) {
     rdr.last_pos = rdr.pos;
     let current_byte_offset = byte_offset(rdr).to_uint();;
     if current_byte_offset < (*rdr.src).len() {
+        assert rdr.curr != -1 as char;
         let last_char = rdr.curr;
         let next = str::char_range_at(*rdr.src, current_byte_offset);
         let byte_offset_diff = next.next - current_byte_offset;
@@ -161,12 +162,7 @@ fn bump(rdr: string_reader) {
                 BytePos(current_byte_offset), byte_offset_diff);
         }
     } else {
-        // XXX: What does this accomplish?
-        if (rdr.curr != -1 as char) {
-            rdr.pos = rdr.pos + BytePos(1u);
-            rdr.col += CharPos(1u);
-            rdr.curr = -1 as char;
-        }
+        rdr.curr = -1 as char;
     }
 }
 fn is_eof(rdr: string_reader) -> bool {