---

yaml
---
r: 36247
b: refs/heads/try2
c: 1f33031
h: refs/heads/master
i:
  36245: a36cbba
  36243: be73c3f
  36239: 94f3be7
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5f881b48cb058236494ccc2f6d54cf617ae21a7f
+refs/heads/try2: 1f3303163c3f4a725b29de5e00eb14a5c53dd16e
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libsyntax/codemap.rs

@@ -63,6 +63,26 @@ struct filemap {
     start_pos: file_pos, mut lines: ~[file_pos]
 }
 
+impl filemap {
+    static fn new_w_substr(+filename: filename, +substr: file_substr,
+                           src: @~str,
+                           start_pos_ch: uint, start_pos_byte: uint)
+        -> filemap {
+        return filemap {
+            name: filename, substr: substr, src: src,
+            start_pos: file_pos {ch: start_pos_ch, byte: start_pos_byte},
+            mut lines: ~[file_pos {ch: start_pos_ch, byte: start_pos_byte}]
+        };
+    }
+
+    static fn new(+filename: filename, src: @~str,
+                  start_pos_ch: uint, start_pos_byte: uint)
+        -> filemap {
+        return filemap::new_w_substr(filename, fss_none, src,
+                                     start_pos_ch, start_pos_byte);
+    }
+}
+
 struct CodeMap_ {
     files: DVec<@filemap>
 }
@@ -75,24 +95,6 @@ struct loc {
 
 fn new_codemap() -> CodeMap { @CodeMap_ {files: DVec()} }
 
-fn new_filemap_w_substr(+filename: filename, +substr: file_substr,
-                        src: @~str,
-                        start_pos_ch: uint, start_pos_byte: uint)
-   -> filemap {
-    return filemap {
-        name: filename, substr: substr, src: src,
-        start_pos: file_pos {ch: start_pos_ch, byte: start_pos_byte},
-        mut lines: ~[file_pos {ch: start_pos_ch, byte: start_pos_byte}]
-    };
-}
-
-fn new_filemap(+filename: filename, src: @~str,
-               start_pos_ch: uint, start_pos_byte: uint)
-    -> filemap {
-    return new_filemap_w_substr(filename, fss_none, src,
-                             start_pos_ch, start_pos_byte);
-}
-
 fn mk_substr_filename(cm: CodeMap, sp: span) -> ~str
 {
     let pos = lookup_char_pos(cm, sp.lo);

branches/try2/src/libsyntax/parse.rs

@@ -20,6 +20,7 @@ use util::interner;
 use diagnostic::{span_handler, mk_span_handler, mk_handler, emitter};
 use lexer::{reader, string_reader};
 use parse::token::{ident_interner, mk_ident_interner};
+use codemap::filemap;
 
 type parse_sess = @{
     cm: codemap::CodeMap,
@@ -172,7 +173,7 @@ fn new_parser_etc_from_source_str(sess: parse_sess, cfg: ast::crate_cfg,
                                   +name: ~str, +ss: codemap::file_substr,
                                   source: @~str) -> (Parser, string_reader) {
     let ftype = parser::SOURCE_FILE;
-    let filemap = @codemap::new_filemap_w_substr
+    let filemap = @filemap::new_w_substr
         (name, ss, source, sess.chpos, sess.byte_pos);
     sess.cm.files.push(filemap);
     let srdr = lexer::new_string_reader(sess.span_diagnostic, filemap,
@@ -197,8 +198,8 @@ fn new_parser_etc_from_file(sess: parse_sess, cfg: ast::crate_cfg,
       result::Err(e) => sess.span_diagnostic.handler().fatal(e)
     }
     let src = @result::unwrap(res);
-    let filemap = @codemap::new_filemap(path.to_str(), src,
-                                       sess.chpos, sess.byte_pos);
+    let filemap = @filemap::new(path.to_str(), src,
+                                sess.chpos, sess.byte_pos);
     sess.cm.files.push(filemap);
     let srdr = lexer::new_string_reader(sess.span_diagnostic, filemap,
                                         sess.interner);

branches/try2/src/libsyntax/parse/comments.rs

@@ -3,6 +3,7 @@ use io::ReaderUtil;
 use util::interner;
 use lexer::{string_reader, bump, is_eof, nextch,
                is_whitespace, get_str_from, reader};
+use codemap::filemap;
 
 export cmnt;
 export lit;
@@ -288,7 +289,7 @@ fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
     let src = @str::from_bytes(srdr.read_whole_stream());
     let itr = parse::token::mk_fake_ident_interner();
     let rdr = lexer::new_low_level_string_reader
-        (span_diagnostic, @codemap::new_filemap(path, src, 0u, 0u), itr);
+        (span_diagnostic, @filemap::new(path, src, 0u, 0u), itr);
 
     let mut comments: ~[cmnt] = ~[];
     let mut literals: ~[lit] = ~[];