---

yaml
---
r: 11016
b: refs/heads/master
c: c0f9073
h: refs/heads/master
v: v3

Author: kevina

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 67e961c17f4f30a73d1730ce6eed3cb1d34b5125
+refs/heads/master: c0f9073557b5daed86aea411fb4c56e554583af2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/comp/syntax/ext/expand.rs

@@ -46,7 +46,13 @@ fn expand_expr(exts: hashmap<str, syntax_extension>, cx: ext_ctxt,
                   }
                 }
               }
-              mac_qq(sp, exp) { (expand_qquote(cx, sp, exp), s) }
+              mac_qq(sp, exp) {
+                let r = expand_qquote(cx, sp, exp);
+                // need to keep going, resuls may contain embedded qquote or
+                // macro that need expanding
+                let r2 = fld.fold_expr(r);
+                (r2.node, s)
+              }
               _ { cx.span_bug(mac.span, "naked syntactic bit") }
             }
           }

trunk/src/comp/syntax/ext/qquote.rs

@@ -38,7 +38,7 @@ fn visit_expr_aq(expr: @ast::expr, &&cx: aq_ctxt, v: vt<aq_ctxt>)
     }
 }
 
-fn expand_qquote(ecx: ext_ctxt, sp: span, e: @ast::expr) -> ast::expr_ {
+fn expand_qquote(ecx: ext_ctxt, sp: span, e: @ast::expr) -> @ast::expr {
     let str = codemap::span_to_snippet(sp, ecx.session().parse_sess.cm);
     let qcx = gather_anti_quotes(sp.lo, e);
     let cx = qcx;
@@ -89,7 +89,7 @@ fn expand_qquote(ecx: ext_ctxt, sp: span, e: @ast::expr) -> ast::expr_ {
                          mk_vec_e(cx,sp, vec::map(qcx.gather, {|g| g.e}))]);
     }
 
-    ret rcall.node;
+    ret rcall;
 }
 
 fn replace(e: @ast::expr, repls: [@ast::expr]) -> @ast::expr {