Allow ExprLit expression macros to be used in patterns.

This commit is contained in:
Eduard Burtescu 2014-08-31 01:45:11 +03:00
parent f297366593
commit a9c3109a6a
3 changed files with 20 additions and 0 deletions

View File

@ -154,6 +154,16 @@ impl MacResult for MacExpr {
fn make_expr(&self) -> Option<Gc<ast::Expr>> { fn make_expr(&self) -> Option<Gc<ast::Expr>> {
Some(self.e) Some(self.e)
} }
fn make_pat(&self) -> Option<Gc<ast::Pat>> {
match self.e.node {
ast::ExprLit(_) => Some(box(GC) ast::Pat {
id: ast::DUMMY_NODE_ID,
node: ast::PatLit(self.e),
span: self.e.span
}),
_ => None
}
}
} }
/// A convenience type for macros that return a single pattern. /// A convenience type for macros that return a single pattern.
pub struct MacPat { pub struct MacPat {

View File

@ -18,4 +18,9 @@ pub fn main() {
concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()), concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()),
"12344.0atrue" "12344.0atrue"
); );
assert!(match "12344.0atrue" {
concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()) => true,
_ => false
})
} }

View File

@ -43,4 +43,9 @@ pub fn main() {
[1] == (42 as u8)); // '*' [1] == (42 as u8)); // '*'
// The Windows tests are wrapped in an extra module for some reason // The Windows tests are wrapped in an extra module for some reason
assert!((m1::m2::where_am_i().as_slice().ends_with("m1::m2"))); assert!((m1::m2::where_am_i().as_slice().ends_with("m1::m2")));
assert!(match (47, "( 2 * 3 ) + 5") {
(line!(), stringify!((2*3) + 5)) => true,
_ => false
})
} }