---

yaml
---
r: 35289
b: refs/heads/master
c: ba354b1
h: refs/heads/master
i:
  35287: a092e61
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b7fcc9b52e83db053633648a61b1a3f4c8ce25e6
+refs/heads/master: ba354b1726988eca0d4a0b023c1bafd576b3570b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/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",