---

yaml
---
r: 38965
b: refs/heads/incoming
c: bcccf33
h: refs/heads/master
i:
  38963: 5cc1a37
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 4a0f4f5e311b7443b29ea31ad0e68e6b4aa63736
+refs/heads/incoming: bcccf333ab728539bf63ed773e6182f9da33683e
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/codemap.rs

@@ -2,6 +2,9 @@
  * in a crate. This to make it possible to represent the positions
  * with single-word things, rather than passing records all over the
  * compiler.
+ *
+ * All represented positions are *absolute* positions within the codemap,
+ * not relative positions within a single file.
  */
 
 use dvec::DVec;
@@ -142,6 +145,8 @@ pub struct Loc<A: Pos> {
     file: @FileMap, line: uint, col: A
 }
 
+/// An absolute offset within the CodeMap (not a relative offset within a
+/// a single FileMap)
 pub struct FilePos {
     ch: CharPos, byte: BytePos
 }

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

@@ -21,9 +21,13 @@ trait reader {
 type string_reader = @{
     span_diagnostic: span_handler,
     src: @~str,
+    // The absolute offset within the codemap of the next character to read
     mut pos: FilePos,
+    // The absolute offset within the codemap of the last character to be read (curr)
     mut last_pos: FilePos,
+    // The column of the next character to read
     mut col: CharPos,
+    // The last character to be read
     mut curr: char,
     filemap: @codemap::FileMap,
     interner: @token::ident_interner,