---

yaml
---
r: 79485
b: refs/heads/snap-stage3
c: 2c51e26
h: refs/heads/master
i:
  79483: 03a1d5d
v: v3

Author: jbclements

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 124eb2119c78651cfaaa7a046a101fa2e20f83ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: dfa04cecca1d7128cc4d8e3868f0b237f6266911
+refs/heads/snap-stage3: 2c51e262f367f0f079135a5a176706ea5ef78f78
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/ext/expand.rs

@@ -1454,13 +1454,20 @@ pub fn fun_to_ctxt_folder<T : 'static + CtxtFn>(cf: @T) -> @AstFoldFns {
         |ast::Ident{name, ctxt}, _| {
         ast::Ident{name:name,ctxt:cf.f(ctxt)}
     };
-    // we've also got to pick up macro invocations; they can
-    // appear as exprs, stmts, items, and types. urg, it's going
-    // to be easier just to add a fold_mac, I think.
-    //let fold_ex : @
+    let fm : @fn(&ast::mac_, span, @ast_fold) -> (ast::mac_,span) =
+        |m, sp, fld| {
+        match *m {
+            mac_invoc_tt(ref path, ref tts, ctxt) =>
+            (mac_invoc_tt(fld.fold_path(path),
+                         fold_tts(*tts,fld),
+                         cf.f(ctxt)),
+            sp)
+        }
+
+    };
     @AstFoldFns{
         fold_ident : fi,
-        // check that it works, then add the fold_expr clause....
+        fold_mac : fm,
         .. *afp
     }
 }