about summary refs log tree commit diff
path: root/src/libsyntax/parse.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-11-12 19:32:48 -0800
committerBrian Anderson <banderson@mozilla.com>2012-11-14 15:18:29 -0800
commitf67bfe97389a256fc95216c29a2b8a066ee16a2c (patch)
treea638c4c480ceb60138a39a05c5b04967ac814eb6 /src/libsyntax/parse.rs
parent9ecf86343a136c71cbb2bb8da9bfd1734fec37f4 (diff)
downloadrust-f67bfe97389a256fc95216c29a2b8a066ee16a2c.tar.gz
rust-f67bfe97389a256fc95216c29a2b8a066ee16a2c.zip
Add types for character position and byte position in the codemap
Diffstat (limited to 'src/libsyntax/parse.rs')
-rw-r--r--src/libsyntax/parse.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/parse.rs b/src/libsyntax/parse.rs
index 01461a85220..27338b86bea 100644
--- a/src/libsyntax/parse.rs
+++ b/src/libsyntax/parse.rs
@@ -20,7 +20,7 @@ use util::interner;
 use diagnostic::{span_handler, mk_span_handler, mk_handler, emitter};
 use lexer::{reader, string_reader};
 use parse::token::{ident_interner, mk_ident_interner};
-use codemap::{CodeMap, FileMap};
+use codemap::{CodeMap, FileMap, CharPos, BytePos};
 
 type parse_sess = @{
     cm: @codemap::CodeMap,
@@ -28,8 +28,8 @@ type parse_sess = @{
     span_diagnostic: span_handler,
     interner: @ident_interner,
     // these two must be kept up to date
-    mut chpos: uint,
-    mut byte_pos: uint
+    mut chpos: CharPos,
+    mut byte_pos: BytePos
 };
 
 fn new_parse_sess(demitter: Option<emitter>) -> parse_sess {
@@ -38,7 +38,7 @@ fn new_parse_sess(demitter: Option<emitter>) -> parse_sess {
              mut next_id: 1,
              span_diagnostic: mk_span_handler(mk_handler(demitter), cm),
              interner: mk_ident_interner(),
-             mut chpos: 0u, mut byte_pos: 0u};
+             mut chpos: CharPos(0u), mut byte_pos: BytePos(0u)};
 }
 
 fn new_parse_sess_special_handler(sh: span_handler, cm: @codemap::CodeMap)
@@ -47,7 +47,7 @@ fn new_parse_sess_special_handler(sh: span_handler, cm: @codemap::CodeMap)
              mut next_id: 1,
              span_diagnostic: sh,
              interner: mk_ident_interner(),
-             mut chpos: 0u, mut byte_pos: 0u};
+             mut chpos: CharPos(0u), mut byte_pos: BytePos(0u)};
 }
 
 fn parse_crate_from_file(input: &Path, cfg: ast::crate_cfg,