---

yaml
---
r: 6900
b: refs/heads/master
c: 1e4de33
h: refs/heads/master
v: v3

Author: lht

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 085c813fe3f03c67aa8e8cb7fa005886d9447c50
+refs/heads/master: 1e4de333740690357a8f58883c5c69bf58be1424

trunk/src/comp/syntax/codemap.rs

@@ -35,15 +35,17 @@ type lookup_fn = fn(file_pos) -> uint;
 
 fn lookup_pos(map: codemap, pos: uint, lookup: lookup_fn) -> loc {
     let len = vec::len(map.files);
+    if len > 1u && map.files[len - 1u].name == "-" {
+        // the trailing "-" must be the core_macros inserted by expand_crate,
+        // exclude it from the targets to lookup
+        len = len - 1u;
+    }
     let a = 0u;
     let b = len;
     while b - a > 1u {
         let m = (a + b) / 2u;
         if lookup(map.files[m].start_pos) > pos { b = m; } else { a = m; }
     }
-    if (a >= len) {
-        ret { filename: "-", line: 0u, col: 0u };
-    }
     let f = map.files[a];
     a = 0u;
     b = vec::len(f.lines);