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

syntax: Remove some more implicit copies

Browse Source
This commit is contained in:
Patrick Walton 2012-06-07 22:51:00 -07:00
parent fd85239119
commit cdcae39ba3
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libsyntax/ext/source_util.rs
View File

@ -34,8 +34,9 @@ fn expand_col(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
fn expand_file(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
_body: ast::mac_body) -> @ast::expr {
get_mac_args(cx, sp, arg, 0u, option::some(0u), "file");
let loc = codemap::lookup_char_pos(cx.codemap(), sp.lo);
ret make_new_lit(cx, sp, ast::lit_str(loc.file.name));
let { file: @{ name: filename, _ }, _ } =
codemap::lookup_char_pos(cx.codemap(), sp.lo);
ret make_new_lit(cx, sp, ast::lit_str(filename));
}
fn expand_stringify(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
@ -66,12 +67,15 @@ fn expand_include_str(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
let file = expr_to_str(cx, args[0], "#include_str requires a string");
alt io::read_whole_file_str(res_rel_file(cx, sp, file)) {
result::ok(src) { ret make_new_lit(cx, sp, ast::lit_str(src)); }
let res = io::read_whole_file_str(res_rel_file(cx, sp, file));
alt res {
result::ok(_) { /* Continue. */ }
result::err(e) {
cx.parse_sess().span_diagnostic.handler().fatal(e)
cx.parse_sess().span_diagnostic.handler().fatal(e);
}
}
ret make_new_lit(cx, sp, ast::lit_str(result::unwrap(res)));
}
fn expand_include_bin(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
@ -93,7 +97,7 @@ fn expand_include_bin(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
}
}
fn res_rel_file(cx: ext_ctxt, sp: codemap::span, arg: path) -> path {
fn res_rel_file(cx: ext_ctxt, sp: codemap::span, +arg: path) -> path {
// NB: relative paths are resolved relative to the compilation unit
if !path::path_is_absolute(arg) {
let cu = codemap::span_to_filename(sp, cx.codemap());

32
src/libsyntax/parse.rs
View File

@ -46,14 +46,11 @@ fn parse_crate_from_crate_file(input: str, cfg: ast::crate_cfg,
let lo = p.span.lo;
let prefix = path::dirname(p.reader.filemap.name);
let leading_attrs = p.parse_inner_attrs_and_next();
let crate_attrs = leading_attrs.inner;
let first_cdir_attr = leading_attrs.next;
let { inner: crate_attrs, next: first_cdir_attr } = leading_attrs;
let cdirs = p.parse_crate_directives(token::EOF, first_cdir_attr);
sess.chpos = p.reader.chpos;
sess.byte_pos = sess.byte_pos + p.reader.pos;
let cx =
@{sess: sess,
cfg: p.cfg};
let cx = @{sess: sess, cfg: /* FIXME: bad */ copy p.cfg};
let (companionmod, _) = path::splitext(path::basename(input));
let (m, attrs) = eval::eval_crate_directives_to_mod(
cx, cdirs, prefix, option::some(companionmod));
@ -63,7 +60,7 @@ fn parse_crate_from_crate_file(input: str, cfg: ast::crate_cfg,
{directives: cdirs,
module: m,
attrs: crate_attrs + attrs,
config: p.cfg});
config: /* FIXME: bad */ copy p.cfg});
}
fn parse_crate_from_source_file(input: str, cfg: ast::crate_cfg,
@ -131,7 +128,7 @@ fn next_node_id(sess: parse_sess) -> node_id {
}
fn new_parser_from_source_str(sess: parse_sess, cfg: ast::crate_cfg,
name: str, ss: codemap::file_substr,
+name: str, +ss: codemap::file_substr,
source: @str) -> parser {
let ftype = parser::SOURCE_FILE;
let filemap = codemap::new_filemap_w_substr
@ -143,20 +140,17 @@ fn new_parser_from_source_str(sess: parse_sess, cfg: ast::crate_cfg,
ret parser(sess, cfg, rdr, ftype);
}
fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, path: str,
fn new_parser_from_file(sess: parse_sess, cfg: ast::crate_cfg, +path: str,
ftype: parser::file_type) ->
parser {
let src = alt io::read_whole_file_str(path) {
result::ok(src) {
// FIXME: This copy is unfortunate (#2319)
@src
}
result::err(e) {
sess.span_diagnostic.handler().fatal(e)
}
};
let filemap = codemap::new_filemap(path, src,
sess.chpos, sess.byte_pos);
let res = io::read_whole_file_str(path);
alt res {
result::ok(_) { /* Continue. */ }
result::err(e) { sess.span_diagnostic.handler().fatal(e); }
}
// FIXME: This copy is unfortunate (#2319).
let src = @copy result::unwrap(res);
let filemap = codemap::new_filemap(path, src, sess.chpos, sess.byte_pos);
sess.cm.files.push(filemap);
let itr = @interner::mk(str::hash, str::eq);
let rdr = lexer::new_reader(sess.span_diagnostic, filemap, itr);