---

yaml
---
r: 11177
b: refs/heads/master
c: f9a63ef
h: refs/heads/master
i:
  11175: 7f24746
v: v3

Author: kevina

[refs]

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

trunk/src/comp/syntax/parse/lexer.rs

@@ -43,7 +43,13 @@ impl reader for reader {
             let next = str::char_range_at(*self.src, self.pos);
             self.pos = next.next;
             self.curr = next.ch;
-        } else { self.curr = -1 as char; }
+        } else {
+            if (self.curr != -1 as char) {
+                self.col += 1u;
+                self.chpos += 1u;
+                self.curr = -1 as char;
+            }
+        }
     }
     fn fatal(m: str) -> ! {
         self.span_diagnostic.span_fatal(

trunk/src/test/run-pass/qquote.rs

@@ -76,6 +76,11 @@ fn main() {
 
     let pat = #ast(pat){some(_)};
     check_pp(pat, pprust::print_pat, "some(_)");
+
+    // issue #1785
+    let x = #ast{1};
+    let test1 = #ast{1+$(x)};
+    check_pp(test1, pprust::print_expr, "1 + 1");
 }
 
 fn check_pp<T>(expr: T, f: fn(pprust::ps, T), expect: str) {