rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change (hopefully) all of the code that generates strs asts to produce ~strs.

Browse Source
This commit is contained in:
Michael Sullivan
2012-07-13 15:54:39 -07:00
parent f5e69d611e
commit 628d3e9d38
8 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ import base::*;
import ast;
import codemap::span;
import print::pprust;
import build::{mk_lit,mk_uniq_vec_e};
import build::{mk_uint,mk_u8,mk_uniq_str,mk_uniq_vec_e};
export expand_line;
export expand_col;
@@ -18,7 +18,7 @@ fn expand_line(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), "line");
let loc = codemap::lookup_char_pos(cx.codemap(), sp.lo);
ret mk_lit(cx, sp, ast::lit_uint(loc.line as u64, ast::ty_u));
ret mk_uint(cx, sp, loc.line);
}
/* #col(): expands to the current column number */
@@ -26,7 +26,7 @@ fn expand_col(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), "col");
let loc = codemap::lookup_char_pos(cx.codemap(), sp.lo);
ret mk_lit(cx, sp, ast::lit_uint(loc.col as u64, ast::ty_u));
ret mk_uint(cx, sp, loc.col);
}
/* #file(): expands to the current filename */
@@ -37,20 +37,20 @@ fn expand_file(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
get_mac_args(cx, sp, arg, 0u, option::some(0u), "file");
let { file: @{ name: filename, _ }, _ } =
codemap::lookup_char_pos(cx.codemap(), sp.lo);
ret mk_lit(cx, sp, ast::lit_str(@filename));
ret mk_uniq_str(cx, sp, filename);
}
fn expand_stringify(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
_body: ast::mac_body) -> @ast::expr {
let args = get_mac_args(cx, sp, arg, 1u, option::some(1u), "stringify");
ret mk_lit(cx, sp, ast::lit_str(@pprust::expr_to_str(args[0])));
ret mk_uniq_str(cx, sp, pprust::expr_to_str(args[0]));
}
fn expand_mod(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");
ret mk_lit(cx, sp, ast::lit_str(
@str::connect(cx.mod_path().map(|x|*x), "::")));
ret mk_uniq_str(cx, sp,
str::connect(cx.mod_path().map(|x|*x), "::"));
}
fn expand_include(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
@@ -77,7 +77,7 @@ fn expand_include_str(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
}
}
ret mk_lit(cx, sp, ast::lit_str(@result::unwrap(res)));
ret mk_uniq_str(cx, sp, result::unwrap(res));
}
fn expand_include_bin(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
@@ -89,7 +89,7 @@ fn expand_include_bin(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
alt io::read_whole_file(res_rel_file(cx, sp, file)) {
result::ok(src) {
let u8_exprs = vec::map(src, |char: u8| {
mk_lit(cx, sp, ast::lit_uint(char as u64, ast::ty_u8))
mk_u8(cx, sp, char)
});
ret mk_uniq_vec_e(cx, sp, u8_exprs);
}