mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create CodeMap.add_filemap

Browse Source
This commit is contained in:
Brian Anderson 2012-11-14 17:43:41 -08:00
parent 3a9ccd53e5
commit b1dff40bae
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsyntax/codemap.rs
View File

@ -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,

4
src/libsyntax/parse.rs
View File

@ -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);