diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-11-12 18:59:37 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-11-14 15:18:26 -0800 |
| commit | 9ecf86343a136c71cbb2bb8da9bfd1734fec37f4 (patch) | |
| tree | 7d1aea436a16f3c53aeaa19d1f8d2b5a987a5487 /src/libsyntax/parse.rs | |
| parent | 38b9740668f596989a2a714e556d59d5b49112dc (diff) | |
| download | rust-9ecf86343a136c71cbb2bb8da9bfd1734fec37f4.tar.gz rust-9ecf86343a136c71cbb2bb8da9bfd1734fec37f4.zip | |
Camel case all the codemap types except span
Diffstat (limited to 'src/libsyntax/parse.rs')
| -rw-r--r-- | src/libsyntax/parse.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libsyntax/parse.rs b/src/libsyntax/parse.rs index 3f15a5b6e88..01461a85220 100644 --- a/src/libsyntax/parse.rs +++ b/src/libsyntax/parse.rs @@ -20,7 +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::{CodeMap, filemap}; +use codemap::{CodeMap, FileMap}; type parse_sess = @{ cm: @codemap::CodeMap, @@ -100,7 +100,7 @@ fn parse_crate_from_source_file(input: &Path, cfg: ast::crate_cfg, fn parse_crate_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg, sess: parse_sess) -> @ast::crate { let (p, rdr) = new_parser_etc_from_source_str(sess, cfg, name, - codemap::fss_none, source); + codemap::FssNone, source); let r = p.parse_crate_mod(cfg); p.abort_if_errors(); sess.chpos = rdr.chpos; @@ -111,7 +111,7 @@ fn parse_crate_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg, fn parse_expr_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg, sess: parse_sess) -> @ast::expr { let (p, rdr) = new_parser_etc_from_source_str(sess, cfg, name, - codemap::fss_none, source); + codemap::FssNone, source); let r = p.parse_expr(); p.abort_if_errors(); sess.chpos = rdr.chpos; @@ -123,7 +123,7 @@ fn parse_item_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg, +attrs: ~[ast::attribute], sess: parse_sess) -> Option<@ast::item> { let (p, rdr) = new_parser_etc_from_source_str(sess, cfg, name, - codemap::fss_none, source); + codemap::FssNone, source); let r = p.parse_item(attrs); p.abort_if_errors(); sess.chpos = rdr.chpos; @@ -135,7 +135,7 @@ fn parse_stmt_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg, +attrs: ~[ast::attribute], sess: parse_sess) -> @ast::stmt { let (p, rdr) = new_parser_etc_from_source_str(sess, cfg, name, - codemap::fss_none, source); + codemap::FssNone, source); let r = p.parse_stmt(attrs); p.abort_if_errors(); sess.chpos = rdr.chpos; @@ -144,7 +144,7 @@ fn parse_stmt_from_source_str(name: ~str, source: @~str, cfg: ast::crate_cfg, } fn parse_from_source_str<T>(f: fn (p: Parser) -> T, - name: ~str, ss: codemap::file_substr, + name: ~str, ss: codemap::FileSubstr, source: @~str, cfg: ast::crate_cfg, sess: parse_sess) -> T @@ -170,10 +170,10 @@ fn next_node_id(sess: parse_sess) -> node_id { } fn new_parser_etc_from_source_str(sess: parse_sess, cfg: ast::crate_cfg, - +name: ~str, +ss: codemap::file_substr, + +name: ~str, +ss: codemap::FileSubstr, source: @~str) -> (Parser, string_reader) { let ftype = parser::SOURCE_FILE; - let filemap = @filemap::new_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, @@ -182,7 +182,7 @@ fn new_parser_etc_from_source_str(sess: parse_sess, cfg: ast::crate_cfg, } fn new_parser_from_source_str(sess: parse_sess, cfg: ast::crate_cfg, - +name: ~str, +ss: codemap::file_substr, + +name: ~str, +ss: codemap::FileSubstr, source: @~str) -> Parser { let (p, _) = new_parser_etc_from_source_str(sess, cfg, name, ss, source); move p @@ -198,7 +198,7 @@ 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 = @filemap::new(path.to_str(), src, + 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, |