user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #9183 : alexcrichton/rust/issue-5794, r=catamorphism

Browse source 
Closes #5794
This commit is contained in:
bors 2013-09-14 12:30:54 -07:00
commit 524c190565
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,8 +76,26 @@ pub fn expand_expr(extsbox: @mut SyntaxEnv,
// mark before:
let marked_before = mark_tts(*tts,fm);
let marked_ctxt = new_mark(fm, ctxt);
// The span that we pass to the expanders we want to
// be the root of the call stack. That's the most
// relevant span and it's the actual invocation of
// the macro.
let mut relevant_info = cx.backtrace();
let mut einfo = relevant_info.unwrap();
loop {
match relevant_info {
None => { break }
Some(e) => {
einfo = e;
relevant_info = einfo.call_site.expn_info;
}
}
}
let expanded =
match expandfun(cx, mac.span, marked_before, marked_ctxt) {
match expandfun(cx, einfo.call_site,
marked_before, marked_ctxt) {
MRExpr(e) => e,
MRAny(expr_maker,_,_) => expr_maker(),
_ => {