---

kevina · kevina · commit 184134f9aabb · 2012-02-03T20:41:49.000-07:00
yaml --- r: 14027 b: refs/heads/try c: 4616117 h: refs/heads/master i: 14025: 78c8a5e 14023: 1b8b740 v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: da74a7f9ca774cd8addcb00a361bb230facc3b31
+refs/heads/try: 4616117f171d96faa6027f89f4d8697815e14566
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/comp/syntax/codemap.rs b/branches/try/src/comp/syntax/codemap.rs
@@ -143,7 +143,7 @@ fn lookup_byte_offset(cm: codemap::codemap, chpos: uint)
 {
     fn lookup(pos: file_pos) -> uint { ret pos.ch; }
     let {fm,line} = option::get(lookup_line(cm,chpos,lookup));
-    let line_offset = fm.lines[line].byte;
+    let line_offset = fm.lines[line].byte - fm.start_pos.byte;
     let col = chpos - fm.lines[line].ch;
     let col_offset = str::byte_len_range(*fm.src, line_offset, col);
     ret {fm: fm, pos: line_offset + col_offset};

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ fn lookup_byte_offset(cm: codemap::codemap, chpos: uint)`
`143`	`143`	`{`
`144`	`144`	`fn lookup(pos: file_pos) -> uint { ret pos.ch; }`
`145`	`145`	`let {fm,line} = option::get(lookup_line(cm,chpos,lookup));`
`146`		`- let line_offset = fm.lines[line].byte;`
	`146`	`+ let line_offset = fm.lines[line].byte - fm.start_pos.byte;`
`147`	`147`	`let col = chpos - fm.lines[line].ch;`
`148`	`148`	`let col_offset = str::byte_len_range(*fm.src, line_offset, col);`
`149`	`149`	`ret {fm: fm, pos: line_offset + col_offset};`