---

yaml
---
r: 36601
b: refs/heads/try2
c: a6fcfd7
h: refs/heads/master
i:
  36599: 82b932c
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 70e0c6e27d54779e718aef866d6ab569af3c6a28
+refs/heads/try2: a6fcfd726bb70582c5e2cf1bb47d2fcd8834e74e
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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

@@ -237,7 +237,7 @@ fn expand_item_mac(exts: HashMap<~str, syntax_extension>,
     );
 
     let extname = cx.parse_sess().interner.get(pth.idents[0]);
-    let (expanded, ex_span) = match exts.find(*extname) {
+    let expanded = match exts.find(*extname) {
         None => cx.span_fatal(pth.span,
                               fmt!("macro undefined: '%s!'", *extname)),
 
@@ -248,22 +248,26 @@ fn expand_item_mac(exts: HashMap<~str, syntax_extension>,
                                     given '%s'", *extname,
                                    *cx.parse_sess().interner.get(it.ident)));
             }
-            (((*expand).expander)(cx, it.span, tts), (*expand).span)
+            cx.bt_push(ExpandedFrom({call_site: it.span,
+                                     callie: {name: *extname,
+                                              span: (*expand).span}}));
+            ((*expand).expander)(cx, it.span, tts)
         }
         Some(item_tt(ref expand)) => {
             if it.ident == parse::token::special_idents::invalid {
                 cx.span_fatal(pth.span,
                               fmt!("macro %s! expects an ident argument",
                                    *extname));
             }
-            (((*expand).expander)(cx, it.span, it.ident, tts), (*expand).span)
+            cx.bt_push(ExpandedFrom({call_site: it.span,
+                                     callie: {name: *extname,
+                                              span: (*expand).span}}));
+            ((*expand).expander)(cx, it.span, it.ident, tts)
         }
         _ => cx.span_fatal(
             it.span, fmt!("%s! is not legal in item position", *extname))
     };
 
-    cx.bt_push(ExpandedFrom({call_site: it.span,
-                              callie: {name: *extname, span: ex_span}}));
     let maybe_it = match expanded {
         mr_item(it) => fld.fold_item(it),
         mr_expr(_) => cx.span_fatal(pth.span,