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

removed unneccessary SyntaxExpander structs

Browse Source
This commit is contained in:
John Clements
2013-05-28 14:53:38 -07:00
parent d8276e75f0
commit 431ede40df
3 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libsyntax/ext/expand.rs
View File

@@ -58,19 +58,16 @@ pub fn expand_expr(extsbox: @mut SyntaxEnv,
pth.span,
fmt!("macro undefined: '%s'", extnamestr))
}
Some(@SE(NormalTT(SyntaxExpanderTT{
expander: exp,
span: exp_sp
}))) => {
Some(@SE(NormalTT(expandfun, exp_span))) => {
cx.bt_push(ExpnInfo {
call_site: s,
callee: NameAndSpan {
name: extnamestr,
span: exp_sp,
span: exp_span,
},
});
let expanded = match exp(cx, mac.span, *tts) {
let expanded = match expandfun(cx, mac.span, *tts) {
MRExpr(e) => e,
MRAny(expr_maker,_,_) => expr_maker(),
_ => {
@@ -379,7 +376,7 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv,
None => cx.span_fatal(pth.span,
fmt!("macro undefined: '%s!'", extnamestr)),
Some(@SE(NormalTT(ref expand))) => {
Some(@SE(NormalTT(expander, span))) => {
if it.ident != parse::token::special_idents::invalid {
cx.span_fatal(pth.span,
fmt!("macro %s! expects no ident argument, \
@@ -390,12 +387,12 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv,
call_site: it.span,
callee: NameAndSpan {
name: extnamestr,
span: expand.span
span: span
}
});
((*expand).expander)(cx, it.span, tts)
expander(cx, it.span, tts)
}
Some(@SE(IdentTT(ref expand))) => {
Some(@SE(IdentTT(expander, span))) => {
if it.ident == parse::token::special_idents::invalid {
cx.span_fatal(pth.span,
fmt!("macro %s! expects an ident argument",
@@ -405,10 +402,10 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv,
call_site: it.span,
callee: NameAndSpan {
name: extnamestr,
span: expand.span
span: span
}
});
((*expand).expander)(cx, it.span, it.ident, tts)
expander(cx, it.span, it.ident, tts)
}
_ => cx.span_fatal(
it.span, fmt!("%s! is not legal in item position", extnamestr))
@@ -476,13 +473,12 @@ pub fn expand_stmt(extsbox: @mut SyntaxEnv,
None =>
cx.span_fatal(pth.span, fmt!("macro undefined: '%s'", extnamestr)),
Some(@SE(NormalTT(
SyntaxExpanderTT{expander: exp, span: exp_sp}))) => {
Some(@SE(NormalTT(expandfun, exp_span))) => {
cx.bt_push(ExpnInfo {
call_site: sp,
callee: NameAndSpan { name: extnamestr, span: exp_sp }
callee: NameAndSpan { name: extnamestr, span: exp_span }
});
let expanded = match exp(cx, mac.span, tts) {
let expanded = match expandfun(cx, mac.span, tts) {
MRExpr(e) =>
@codemap::Spanned { node: StmtExpr(e, cx.next_id()),
span: e.span},