---

yaml
---
r: 38958
b: refs/heads/incoming
c: b1dff40
h: refs/heads/master
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: 3a9ccd53e559be6db3300eb161951fe75b1ff962
+refs/heads/incoming: b1dff40bae94dd0fd1e4846fd7b76723d0a3f9f9
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/codemap.rs

@@ -230,6 +230,10 @@ pub impl CodeMap {
         }
     }
 
+    pub fn add_filemap(@self, filemap: @FileMap) {
+        self.files.push(filemap);
+    }
+
     pub fn mk_substr_filename(@self, sp: span) -> ~str {
         let pos = self.lookup_char_pos(sp.lo);
         return fmt!("<%s:%u:%u>", pos.file.name,

branches/incoming/src/libsyntax/parse.rs

@@ -173,7 +173,7 @@ fn new_parser_etc_from_source_str(sess: parse_sess, cfg: ast::crate_cfg,
     let ftype = parser::SOURCE_FILE;
     let filemap = @FileMap::new_w_substr
         (name, ss, source, sess.pos);
-    sess.cm.files.push(filemap);
+    sess.cm.add_filemap(filemap);
     let srdr = lexer::new_string_reader(sess.span_diagnostic, filemap,
                                         sess.interner);
     return (Parser(sess, cfg, srdr as reader, ftype), srdr);
@@ -198,7 +198,7 @@ fn new_parser_etc_from_file(sess: parse_sess, cfg: ast::crate_cfg,
     let src = @result::unwrap(res);
     let filemap = @FileMap::new(path.to_str(), src,
                                 sess.pos);
-    sess.cm.files.push(filemap);
+    sess.cm.add_filemap(filemap);
     let srdr = lexer::new_string_reader(sess.span_diagnostic, filemap,
                                         sess.interner);
     return (Parser(sess, cfg, srdr as reader, ftype), srdr);