bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid returning original macro if expansion fails.

Browse source 
Closes #11692. Instead of returning the original expression, a dummy expression
(with identical span) is returned. This prevents infinite loops of failed
expansions as well as odd double error messages in certain situations.
This commit is contained in:
Douglas Young 2014-02-18 16:14:12 +00:00
parent 517e38997d
commit 0bdfd0f4c7
11 changed files with 53 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,7 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
format!("expected macro name without module \
separators"));
// let compilation continue
return e;
return MacResult::raw_dummy_expr(e.span);
}
let extname = pth.segments[0].identifier;
let extnamestr = token::get_ident(extname);
@ -64,7 +64,7 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
extnamestr.get()));
// let compilation continue
return e;
return MacResult::raw_dummy_expr(e.span);
}
Some(&NormalTT(ref expandfun, exp_span)) => {
fld.cx.bt_push(ExpnInfo {
@ -98,7 +98,7 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
extnamestr.get()
)
);
return e;
return MacResult::raw_dummy_expr(e.span);
}
};
@ -111,7 +111,7 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
format!("'{}' is not a tt-style macro",
extnamestr.get())
);
return e;
return MacResult::raw_dummy_expr(e.span);
}
};