Set span for interpolated tokens correctly

[rust.git] / src / libsyntax / ext / tt / transcribe.rs

diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index c048547f5c979973e8bf8f68dc7f9499080adede..6cf05558adb55dde27fd4eebd4620ce995cfc3f4 100644 (file)
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -300,13 +300,13 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
                             // (a) idents can be in lots of places, so it'd be a pain
                             // (b) we actually can, since it's a token.
                             MatchedNonterminal(NtIdent(ref sn, b)) => {
-                                r.cur_span = sp;
+                                r.cur_span = sn.span;
                                 r.cur_tok = token::Ident(sn.node, b);
                                 return ret_val;
                             }
                             MatchedNonterminal(NtExpr(ref expr)) => {
                                 let mut expr = (**expr).clone();
-                                update_span(sp, &mut expr);
+                                //update_span(sp, &mut expr);
                                 // FIXME(pcwalton): Bad copy.
                                 r.cur_span = sp;
                                 r.cur_tok = token::Interpolated(NtExpr(ptr::P(expr)));