---

yaml
---
r: 39147
b: refs/heads/incoming
c: ba354b1
h: refs/heads/master
i:
  39145: 92bfd5c
  39143: 75b2292
v: v3

Author: paulstansifer

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: b7fcc9b52e83db053633648a61b1a3f4c8ce25e6
+refs/heads/incoming: ba354b1726988eca0d4a0b023c1bafd576b3570b
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ext/expand.rs

@@ -303,6 +303,24 @@ fn expand_stmt(exts: HashMap<~str, syntax_extension>, cx: ext_ctxt,
 
             return (fully_expanded, sp)
         }
+
+        Some(normal({expander: exp, span: exp_sp})) => {
+            //convert the new-style invoc for the old-style macro
+            let arg = base::tt_args_to_original_flavor(cx, pth.span, tts);
+            let exp_expr = exp(cx, mac.span, arg, None);
+            let expanded = @{node: ast::stmt_expr(exp_expr, cx.next_id()),
+                             span: exp_expr.span};
+
+            cx.bt_push(ExpandedFrom({call_site: sp,
+                                      callie: {name: *extname,
+                                               span: exp_sp}}));
+            //keep going, outside-in
+            let fully_expanded = fld.fold_stmt(expanded).node;
+            cx.bt_pop();
+
+            (fully_expanded, sp)
+        }
+
         _ => {
             cx.span_fatal(pth.span,
                           fmt!("'%s' is not a tt-style macro",