summary refs log tree commit diff
path: root/src/libsyntax/parse/lexer.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-12-27 12:06:59 -0800
committerPatrick Walton <pcwalton@mimiga.net>2014-01-03 14:01:56 -0800
commitaa3527a1a3fca8842ded945b2951ec2a4bd8a55d (patch)
tree168d2e3a8b7bb569e4c00c0ece85806b6b0ffe3c /src/libsyntax/parse/lexer.rs
parent13b235d1e5d7604f0f1b4bfd9941ff046cef1277 (diff)
downloadrust-aa3527a1a3fca8842ded945b2951ec2a4bd8a55d.tar.gz
rust-aa3527a1a3fca8842ded945b2951ec2a4bd8a55d.zip
libsyntax: De-`@mut` `StringReader::col`
Diffstat (limited to 'src/libsyntax/parse/lexer.rs')
-rw-r--r--src/libsyntax/parse/lexer.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index b6954d0ad7b..34aa9c5142b 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -48,7 +48,7 @@ pub struct StringReader {
     // The absolute offset within the codemap of the last character read(curr)
     last_pos: Cell<BytePos>,
     // The column of the next character to read
-    col: CharPos,
+    col: Cell<CharPos>,
     // The last character to be read
     curr: char,
     filemap: @codemap::FileMap,
@@ -76,7 +76,7 @@ pub fn new_low_level_string_reader(span_diagnostic: @mut SpanHandler,
         src: filemap.src,
         pos: Cell::new(filemap.start_pos),
         last_pos: Cell::new(filemap.start_pos),
-        col: CharPos(0),
+        col: Cell::new(CharPos(0)),
         curr: initial_char,
         filemap: filemap,
         /* dummy values; not read */
@@ -96,7 +96,7 @@ fn dup_string_reader(r: @mut StringReader) -> @mut StringReader {
         src: r.src,
         pos: Cell::new(r.pos.get()),
         last_pos: Cell::new(r.last_pos.get()),
-        col: r.col,
+        col: Cell::new(r.col.get()),
         curr: r.curr,
         filemap: r.filemap,
         peek_tok: r.peek_tok.clone(),
@@ -249,10 +249,10 @@ pub fn bump(rdr: &mut StringReader) {
         let byte_offset_diff = next.next - current_byte_offset;
         rdr.pos.set(rdr.pos.get() + Pos::from_uint(byte_offset_diff));
         rdr.curr = next.ch;
-        rdr.col = rdr.col + CharPos(1u);
+        rdr.col.set(rdr.col.get() + CharPos(1u));
         if last_char == '\n' {
             rdr.filemap.next_line(rdr.last_pos.get());
-            rdr.col = CharPos(0u);
+            rdr.col.set(CharPos(0u));
         }
 
         if byte_offset_diff > 1 {