mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent panics on list-like macro uses with trailing commas

Browse Source
This commit is contained in:
Marcus Klaas 2015-10-08 22:04:17 +02:00
parent 915f27f177
commit 8daf4c3a31
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 => {