squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge pull request #428 from marcusklaas/macro-fewer-panix

Browse source 
Prevent panics on list-like macro uses with trailing commas
This commit is contained in:
Nick Cameron 2015-10-09 09:46:01 +13:00
commit 9209e1cd1e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/macros.rs
View file

@ -64,7 +64,8 @@ pub fn rewrite_macro(mac: &ast::Mac,
let wrapped_tt_vec = ForceSend(mac.node.tts.clone());
// Wrap expression parsing logic in a thread since the libsyntax parser
// panicks on failure, which we do not want to propagate.
// panics on failure, which we do not want to propagate.
// The expression vector is wrapped in an Option inside a Result.
let expr_vec_result = thread::catch_panic(move || {
let parse_session = ParseSess::new();
let mut parser = tts_to_parser(&parse_session, wrapped_tt_vec.0, vec![]);
@ -80,11 +81,15 @@ pub fn rewrite_macro(mac: &ast::Mac,
}
let _ = parser.bump();
if parser.token == Token::Eof {
return None;
}
}
expr_vec
Some(expr_vec)
});
let expr_vec = try_opt!(expr_vec_result.ok());
let expr_vec = try_opt!(try_opt!(expr_vec_result.ok()));
match style {
MacroStyle::Parens => {