Add types for character position and byte position in the codemap

1 files changed, 25 insertions, 25 deletions

diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index 06b8b1e8eee..dbeaff28625 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -1,5 +1,5 @@
 use diagnostic::span_handler;
-use codemap::{span, CodeMap};
+use codemap::{span, CodeMap, CharPos, BytePos};
 use ext::tt::transcribe::{tt_reader,  new_tt_reader, dup_tt_reader,
                              tt_next_token};
 
@@ -21,10 +21,10 @@ trait reader {
 type string_reader = @{
     span_diagnostic: span_handler,
     src: @~str,
-    mut col: uint,
-    mut pos: uint,
+    mut col: CharPos,
+    mut pos: BytePos,
     mut curr: char,
-    mut chpos: uint,
+    mut chpos: CharPos,
     filemap: @codemap::FileMap,
     interner: @token::ident_interner,
     /* cached: */
@@ -46,15 +46,15 @@ fn new_low_level_string_reader(span_diagnostic: span_handler,
                                itr: @token::ident_interner)
     -> string_reader {
     let r = @{span_diagnostic: span_diagnostic, src: filemap.src,
-              mut col: 0u, mut pos: 0u, mut curr: -1 as char,
+              mut col: CharPos(0), mut pos: BytePos(0), mut curr: -1 as char,
               mut chpos: filemap.start_pos.ch,
               filemap: filemap, interner: itr,
               /* dummy values; not read */
               mut peek_tok: token::EOF,
-              mut peek_span: ast_util::mk_sp(0u,0u)};
-    if r.pos < (*filemap.src).len() {
-        let next = str::char_range_at(*r.src, r.pos);
-        r.pos = next.next;
+              mut peek_span: ast_util::dummy_sp()};
+    if r.pos.to_uint() < (*filemap.src).len() {
+        let next = str::char_range_at(*r.src, r.pos.to_uint());
+        r.pos = BytePos(next.next);
         r.curr = next.ch;
     }
     return r;
@@ -124,27 +124,27 @@ fn string_advance_token(&&r: string_reader) {
 
 }
 
-fn get_str_from(rdr: string_reader, start: uint) -> ~str unsafe {
+fn get_str_from(rdr: string_reader, start: BytePos) -> ~str unsafe {
     // I'm pretty skeptical about this subtraction. What if there's a
     // multi-byte character before the mark?
-    return str::slice(*rdr.src, start - 1u, rdr.pos - 1u);
+    return str::slice(*rdr.src, start.to_uint() - 1u, rdr.pos.to_uint() - 1u);
 }
 
 fn bump(rdr: string_reader) {
-    if rdr.pos < (*rdr.src).len() {
-        rdr.col += 1u;
-        rdr.chpos += 1u;
+    if rdr.pos.to_uint() < (*rdr.src).len() {
+        rdr.col += CharPos(1u);
+        rdr.chpos += CharPos(1u);
         if rdr.curr == '\n' {
             rdr.filemap.next_line(rdr.chpos, rdr.pos);
-            rdr.col = 0u;
+            rdr.col = CharPos(0u);
         }
-        let next = str::char_range_at(*rdr.src, rdr.pos);
-        rdr.pos = next.next;
+        let next = str::char_range_at(*rdr.src, rdr.pos.to_uint());
+        rdr.pos = BytePos(next.next);
         rdr.curr = next.ch;
     } else {
         if (rdr.curr != -1 as char) {
-            rdr.col += 1u;
-            rdr.chpos += 1u;
+            rdr.col += CharPos(1u);
+            rdr.chpos += CharPos(1u);
             rdr.curr = -1 as char;
         }
     }
@@ -153,8 +153,8 @@ fn is_eof(rdr: string_reader) -> bool {
     rdr.curr == -1 as char
 }
 fn nextch(rdr: string_reader) -> char {
-    if rdr.pos < (*rdr.src).len() {
-        return str::char_at(*rdr.src, rdr.pos);
+    if rdr.pos.to_uint() < (*rdr.src).len() {
+        return str::char_at(*rdr.src, rdr.pos.to_uint());
     } else { return -1 as char; }
 }
 
@@ -211,7 +211,7 @@ fn consume_any_line_comment(rdr: string_reader)
             bump(rdr);
             // line comments starting with "///" or "//!" are doc-comments
             if rdr.curr == '/' || rdr.curr == '!' {
-                let start_chpos = rdr.chpos - 2u;
+                let start_chpos = rdr.chpos - CharPos(2u);
                 let mut acc = ~"//";
                 while rdr.curr != '\n' && !is_eof(rdr) {
                     str::push_char(&mut acc, rdr.curr);
@@ -235,7 +235,7 @@ fn consume_any_line_comment(rdr: string_reader)
             let cmap = @CodeMap::new();
             (*cmap).files.push(rdr.filemap);
             let loc = cmap.lookup_char_pos_adj(rdr.chpos);
-            if loc.line == 1u && loc.col == 0u {
+            if loc.line == 1u && loc.col == CharPos(0u) {
                 while rdr.curr != '\n' && !is_eof(rdr) { bump(rdr); }
                 return consume_whitespace_and_comments(rdr);
             }
@@ -250,7 +250,7 @@ fn consume_block_comment(rdr: string_reader)
 
     // block comments starting with "/**" or "/*!" are doc-comments
     if rdr.curr == '*' || rdr.curr == '!' {
-        let start_chpos = rdr.chpos - 2u;
+        let start_chpos = rdr.chpos - CharPos(2u);
         let mut acc = ~"/*";
         while !(rdr.curr == '*' && nextch(rdr) == '/') && !is_eof(rdr) {
             str::push_char(&mut acc, rdr.curr);
@@ -584,7 +584,7 @@ fn next_token_inner(rdr: string_reader) -> token::Token {
         return token::LIT_INT(c2 as i64, ast::ty_char);
       }
       '"' => {
-        let n = rdr.chpos;
+        let n = rdr.pos;
         bump(rdr);
         while rdr.curr != '"' {
             if is_eof(rdr) {