about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index d65be043f86..5e174f7f34f 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/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 {