---

yaml
---
r: 8029
b: refs/heads/snap-stage3
c: 9dcb674
h: refs/heads/master
i:
  8027: f116a8d
v: v3

Author: kevina

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e127bf680f8a133f339901e05a44ac20b5faed3e
+refs/heads/snap-stage3: 9dcb674525c5169a8649475699e60e0cbaed8c0a
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/comp/syntax/codemap.rs

@@ -34,7 +34,9 @@ fn next_line(file: filemap, chpos: uint, byte_pos: uint) {
 
 type lookup_fn = fn@(file_pos) -> uint;
 
-fn lookup_pos(map: codemap, pos: uint, lookup: lookup_fn) -> loc {
+fn lookup_line(map: codemap, pos: uint, lookup: lookup_fn)
+    -> option::t<{fm: filemap, line: uint}>
+{
     let len = vec::len(map.files);
     let a = 0u;
     let b = len;
@@ -43,7 +45,7 @@ fn lookup_pos(map: codemap, pos: uint, lookup: lookup_fn) -> loc {
         if lookup(map.files[m].start_pos) > pos { b = m; } else { a = m; }
     }
     if (a >= len) {
-        ret { filename: "-", line: 0u, col: 0u };
+        ret none;
     }
     let f = map.files[a];
     a = 0u;
@@ -52,7 +54,18 @@ fn lookup_pos(map: codemap, pos: uint, lookup: lookup_fn) -> loc {
         let m = (a + b) / 2u;
         if lookup(f.lines[m]) > pos { b = m; } else { a = m; }
     }
-    ret {filename: f.name, line: a + 1u, col: pos - lookup(f.lines[a])};
+    ret some({fm: f, line: a});
+}
+
+fn lookup_pos(map: codemap, pos: uint, lookup: lookup_fn) -> loc {
+    alt lookup_line(map, pos, lookup) {
+      some({fm: f, line: a}) {
+        {filename: f.name, line: a + 1u, col: pos - lookup(f.lines[a])}
+      }
+      none {
+        { filename: "-", line: 0u, col: 0u }
+      }
+    }
 }
 
 fn lookup_char_pos(map: codemap, pos: uint) -> loc {
@@ -125,6 +138,30 @@ fn get_line(fm: filemap, line: int) -> str unsafe {
     ret str::unsafe::slice_bytes(*fm.src, begin, end);
 }
 
+fn lookup_byte_offset(cm: codemap::codemap, chpos: uint)
+    -> {fm: filemap, pos: 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 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};
+}
+
+fn span_to_snippet(sp: span, cm: codemap::codemap) -> str {
+    let begin = lookup_byte_offset(cm,sp.lo);
+    let end   = lookup_byte_offset(cm,sp.hi);
+    assert begin.fm == end.fm;
+    ret str::slice(*begin.fm.src, begin.pos, end.pos);
+}
+
+fn get_snippet(cm: codemap::codemap, fidx: uint, lo: uint, hi: uint) -> str
+{
+    let fm = cm.files[fidx];
+    ret str::slice(*fm.src, lo, hi)
+}
+
 fn get_filemap(cm: codemap, filename: str) -> filemap {
     for fm: filemap in cm.files { if fm.name == filename { ret fm; } }
     //XXjdm the following triggers a mismatched type bug