nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-01 09:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2571 from topecongiro/issue-2569

Browse Source 
Avoid panicking on macro call with a single comma
This commit is contained in:
Nick Cameron 2018-03-28 17:02:49 +02:00 committed by GitHub
commit 72b715bad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/macros.rs
View File

@ -58,8 +58,7 @@ pub enum MacroArg {
Expr(ptr::P<ast::Expr>),
Ty(ptr::P<ast::Ty>),
Pat(ptr::P<ast::Pat>),
// `parse_item` returns `Option<ptr::P<ast::Item>>`.
Item(Option<ptr::P<ast::Item>>),
Item(ptr::P<ast::Item>),
}
impl Rewrite for ast::Item {
@ -78,14 +77,14 @@ impl Rewrite for MacroArg {
MacroArg::Expr(ref expr) => expr.rewrite(context, shape),
MacroArg::Ty(ref ty) => ty.rewrite(context, shape),
MacroArg::Pat(ref pat) => pat.rewrite(context, shape),
MacroArg::Item(ref item) => item.as_ref().and_then(|item| item.rewrite(context, shape)),
MacroArg::Item(ref item) => item.rewrite(context, shape),
}
}
}
fn parse_macro_arg(parser: &mut Parser) -> Option<MacroArg> {
macro_rules! parse_macro_arg {
($macro_arg:ident, $parser:ident) => {
($macro_arg:ident, $parser:ident, $f:expr) => {
let mut cloned_parser = (*parser).clone();
match cloned_parser.$parser() {
Ok(x) => {
@ -94,7 +93,7 @@ fn parse_macro_arg(parser: &mut Parser) -> Option<MacroArg> {
} else {
// Parsing succeeded.
*parser = cloned_parser;
return Some(MacroArg::$macro_arg(x.clone()));
return Some(MacroArg::$macro_arg($f(x)?));
}
}
Err(mut e) => {
@ -105,10 +104,11 @@ fn parse_macro_arg(parser: &mut Parser) -> Option<MacroArg> {
};
}
parse_macro_arg!(Expr, parse_expr);
parse_macro_arg!(Ty, parse_ty);
parse_macro_arg!(Pat, parse_pat);
parse_macro_arg!(Item, parse_item);
parse_macro_arg!(Expr, parse_expr, |x: ptr::P<ast::Expr>| Some(x));
parse_macro_arg!(Ty, parse_ty, |x: ptr::P<ast::Ty>| Some(x));
parse_macro_arg!(Pat, parse_pat, |x: ptr::P<ast::Pat>| Some(x));
// `parse_item` returns `Option<ptr::P<ast::Item>>`.
parse_macro_arg!(Item, parse_item, |x: Option<ptr::P<ast::Item>>| x);
None
}

2
src/spanned.rs
View File

@ -187,7 +187,7 @@ impl Spanned for MacroArg {
MacroArg::Expr(ref expr) => expr.span(),
MacroArg::Ty(ref ty) => ty.span(),
MacroArg::Pat(ref pat) => pat.span(),
MacroArg::Item(ref item) => item.as_ref().unwrap().span(),
MacroArg::Item(ref item) => item.span(),
}
}
}

2
tests/source/macros.rs
View File

@ -10,6 +10,8 @@ peg_file! modname ("mygrammarfile.rustpeg");
fn main() {
foo! ( );
foo!(,);
bar!( a , b , c );
bar!( a , b , c , );

2
tests/target/macros.rs
View File

@ -15,6 +15,8 @@ peg_file! modname("mygrammarfile.rustpeg");
fn main() {
foo!();
foo!(,);
bar!(a, b, c);
bar!(a, b, c,);