bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Redo exported macro serialization

Browse source 
The old method of serializing the AST gives totally bogus spans if the
expansion of an imported macro causes compilation errors. The best
solution seems to be to serialize the actual textual macro definition
and load it the same way the std-macros are. I'm not totally confident
that getting the source from the CodeMap will always do the right thing,
but it seems to work in simple cases.
This commit is contained in:
Steven Fackler 2014-01-21 23:09:53 -08:00
parent f8477c9da5
commit d908e97da3
10 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libsyntax/ext/expand.rs
View file

@ -406,9 +406,20 @@ pub fn expand_view_item(vi: &ast::ViewItem,
fn load_extern_macros(crate: &ast::ViewItem, fld: &mut MacroExpander) {
let MacroCrate { lib, cnum } = fld.cx.loader.load_crate(crate);
let crate_name = match crate.node {
ast::ViewItemExternMod(ref name, _, _) => token::ident_to_str(name),
_ => unreachable!(),
};
let name = format!("<{} macros>", crate_name).to_managed();
let exported_macros = fld.cx.loader.get_exported_macros(cnum);
for &it in exported_macros.iter() {
expand_item_mac(it, fld);
for source in exported_macros.iter() {
let item = parse::parse_item_from_source_str(name,
source.to_managed(),
fld.cx.cfg(),
fld.cx.parse_sess())
.expect("expected a serialized item");
expand_item_mac(item, fld);
}
let path = match lib {
@ -944,7 +955,6 @@ pub fn inject_std_macros(parse_sess: @parse::ParseSess,
let sm = match parse_item_from_source_str(@"<std-macros>",
std_macros(),
cfg.clone(),
~[],
parse_sess) {
Some(item) => item,
None => fail!("expected core macros to parse correctly")
@ -1212,7 +1222,7 @@ mod test {
fail!("lolwut")
}
fn get_exported_macros(&mut self, _: ast::CrateNum) -> ~[@ast::Item] {
fn get_exported_macros(&mut self, _: ast::CrateNum) -> ~[~str] {
fail!("lolwut")
}
@ -1289,7 +1299,7 @@ mod test {
let item_ast = parse::parse_item_from_source_str(
@"<test>",
src,
cfg,~[],sess);
cfg,sess);
match item_ast {
Some(_) => (), // success
None => fail!("expected this to parse")