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

Merge remote-tracking branch 'remotes/origin/incoming' into incoming

Browse Source
This commit is contained in:
Erick Tryzelaar
2013-02-28 07:25:31 -08:00
parent 7f5d4cbda0 d0a12347de
commit 3953bdd812
42 changed files with 1304 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,19 +119,27 @@ pub fn expand_include_bin(cx: ext_ctxt, sp: span, tts: &[ast::token_tree])
// recur along an ExpnInfo chain to find the original expression
fn topmost_expn_info(expn_info: @codemap::ExpnInfo) -> @codemap::ExpnInfo {
let ExpandedFrom(CallInfo { call_site, _ }) = *expn_info;
match call_site.expn_info {
Some(next_expn_info) => {
let ExpandedFrom(CallInfo {
callee: NameAndSpan {name, _},
_
}) = *next_expn_info;
// Don't recurse into file using "include!"
if name == ~"include" { return expn_info; }
topmost_expn_info(next_expn_info)
},
None => expn_info
match *expn_info {
ExpandedFrom(CallInfo { call_site: ref call_site, _ }) => {
match call_site.expn_info {
Some(next_expn_info) => {
match *next_expn_info {
ExpandedFrom(CallInfo {
callee: NameAndSpan { name: ref name, _ },
_
}) => {
// Don't recurse into file using "include!"
if *name == ~"include" {
expn_info
} else {
topmost_expn_info(next_expn_info)
}
}
}
},
None => expn_info
}
}
}
}