commit 84aa0750a08a5e0acced2bb00ba6c9f09117a039
author David Tolnay <dtolnay@gmail.com> Sun Oct 02 23:01:13 2016 -0700
committer David Tolnay <dtolnay@gmail.com> Sun Oct 02 23:02:12 2016 -0700
tree 7b0d9471194879cb42bf93f43542ef50ea55346d
parent cfe5502fb3e7bde504861f9602d5a36954665e3b

Macro parsing

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index 2865c2c..e3e4e55 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -346,6 +346,7 @@
     use ident::parsing::ident;
     use item::parsing::item;
     use lit::parsing::lit;
+    use mac::parsing::mac;
     use nom::IResult::Error;
     use ty::parsing::{mutability, path, qpath, ty};
 
@@ -388,7 +389,8 @@
             expr_continue
             |
             expr_ret
-            // TODO: Mac
+            |
+            expr_mac
             |
             expr_repeat
         ) >>
@@ -429,6 +431,8 @@
         (e)
     ));
 
+    named!(expr_mac -> Expr, map!(mac, Expr::Mac));
+
     named!(expr_paren -> Expr, do_parse!(
         punct!("(") >>
         e: expr >>
@@ -876,9 +880,12 @@
         // TODO: Lit
         // TODO: Range
         // TODO: Vec
-        // TODO: Mac
+        |
+        pat_mac
     ));
 
+    named!(pat_mac -> Pat, map!(mac, Pat::Mac));
+
     named!(pat_wild -> Pat, map!(keyword!("_"), |_| Pat::Wild));
 
     named!(pat_ident -> Pat, do_parse!(