---

yaml
---
r: 22445
b: refs/heads/master
c: 650009f
h: refs/heads/master
i:
  22443: b63ad41
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c0abd6a2eba72f0bde46abc33abcf361d45c376c
+refs/heads/master: 650009f80cfc20d1c3a8d31ebe6593b65e5951bf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/run-pass/macro-2.rs

@@ -1,9 +1,20 @@
+// xfail-pretty - token trees can't pretty print
+
 fn main() {
     #macro[[#mylambda[x, body],
             {
-                fn f(x: int) -> int { ret body }
+                fn f(x: int) -> int { ret body; }
                 f
             }]];
 
     assert (#mylambda[y, y * 2](8) == 16);
+
+    macro_rules! mylambda_tt{
+        {$x:ident, $body:expr} => {
+            fn f($x: int) -> int { ret $body; };
+            f
+        }
+    }
+
+    assert(mylambda_tt!{y, y * 2}(8) == 16)
 }

trunk/src/test/run-pass/macro-3.rs

@@ -1,5 +1,12 @@
+// xfail-pretty - token trees can't pretty print
+
 fn main() {
     #macro[[#trivial[], 1 * 2 * 4 * 2 * 1]];
 
     assert (#trivial[] == 16);
+
+    macro_rules! trivial_tt{
+        {} => {1*2*4*2*1}
+    }
+    assert(trivial_tt!{} == 16);
 }

trunk/src/test/run-pass/macro-by-example-1.rs

@@ -1,7 +1,14 @@
+// xfail-pretty - token trees can't pretty print
+
 fn main() {
     #macro[[#apply[f, [x, ...]], f(x, ...)]];
 
+    macro_rules! apply_tt{
+        {$f:expr, ($($x:expr),*)} => {$f($($x),*)}
+    }
+
     fn add(a: int, b: int) -> int { ret a + b; }
 
     assert (#apply[add, [1, 15]] == 16);
+    assert(apply_tt!{add, (1, 15)} == 16);
 }

trunk/src/test/run-pass/macro.rs

@@ -1 +1,11 @@
-fn main() { #macro[[#m1[a], a * 4]]; assert (#m1[2] == 8); }
+// xfail-pretty - token trees can't pretty print
+
+fn main() {
+    #macro[[#m1[a], a * 4]];
+    assert (#m1[2] == 8);
+
+    macro_rules! m1tt {
+        {$a:expr} => {$a*4}
+    };
+    assert(m1tt!{2} == 8);
+}