---

yaml
---
r: 11017
b: refs/heads/master
c: 099290b
h: refs/heads/master
i:
  11015: 9f8428a
v: v3

Author: kevina

[refs]

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

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

@@ -38,6 +38,10 @@ fn visit_expr_aq(expr: @ast::expr, &&cx: aq_ctxt, v: vt<aq_ctxt>)
     }
 }
 
+fn is_space(c: char) -> bool {
+    syntax::parse::lexer::is_whitespace(c)
+}
+
 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);
@@ -48,20 +52,28 @@ fn expand_qquote(ecx: ext_ctxt, sp: span, e: @ast::expr) -> @ast::expr {
         prev = lo;
     }
     let str2 = "";
-    let active = true;
+    enum state {active, skip(uint), blank};
+    let state = active;
     let i = 0u, j = 0u;
     let g_len = vec::len(cx.gather);
     str::chars_iter(str) {|ch|
-        if (active && j < g_len && i == cx.gather[j].lo) {
+        if (j < g_len && i == cx.gather[j].lo) {
             assert ch == '$';
-            active = false;
-            str2 += #fmt(" $%u ", j);
+            let repl = #fmt("$%u ", j);
+            state = skip(str::char_len(repl));
+            str2 += repl;
+        }
+        alt state {
+          active {str::push_char(str2, ch);}
+          skip(1u) {state = blank;}
+          skip(sk) {state = skip (sk-1u);}
+          blank if is_space(ch) {str::push_char(str2, ch);}
+          blank {str::push_char(str2, ' ');}
         }
-        if (active) {str::push_char(str2, ch);}
         i += 1u;
-        if (!active && j < g_len && i == cx.gather[j].hi) {
+        if (j < g_len && i == cx.gather[j].hi) {
             assert ch == ')';
-            active = true;
+            state = active;
             j += 1u;
         }
     }