Clean up raw identifier handling when recovering tokens from AST.

diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
index 090b9a354463050256323be1c37254d49f74b216..540a03ff032ffef2527e5395d99cad058fb08975 100644 (file)
--- a/src/libsyntax/ext/quote.rs
+++ b/src/libsyntax/ext/quote.rs
@@ -238,8 +238,9 @@ fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
                 if i > 0 {
                     inner.push(TokenTree::Token(self.span, token::Colon).into());
                 }
-                inner.push(TokenTree::Token(self.span,
-                                            token::Ident(segment.identifier, false)).into());
+                inner.push(TokenTree::Token(
+                    self.span, token::Token::from_ast_ident(segment.identifier)
+                ).into());
             }
             inner.push(self.tokens.clone());
 

diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index 0f5855a32259cd8377edefb64576dae65b87611e..3f01d5ec6dd876e1117ea9c030206968d1f3ffbc 100644 (file)
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -169,7 +169,7 @@ pub fn transcribe(cx: &ExtCtxt,
                         Ident { ctxt: ident.ctxt.apply_mark(cx.current_expansion.mark), ..ident };
                     sp = sp.with_ctxt(sp.ctxt().apply_mark(cx.current_expansion.mark));
                     result.push(TokenTree::Token(sp, token::Dollar).into());
-                    result.push(TokenTree::Token(sp, token::Ident(ident, false)).into());
+                    result.push(TokenTree::Token(sp, token::Token::from_ast_ident(ident)).into());
                 }
             }
             quoted::TokenTree::Delimited(mut span, delimited) => {

diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 4e7a282adc5842a38dda60abca5b4ce3e7bdabbe..7798a7a77ee6c8c63e96cd47895759427b6d213b 100644 (file)
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -236,7 +236,7 @@ pub fn interpolated(nt: Nonterminal) -> Token {
 
     /// Recovers a `Token` from an `ast::Ident`. This creates a raw identifier if necessary.
     pub fn from_ast_ident(ident: ast::Ident) -> Token {
-        Ident(ident, is_reserved_ident(ident))
+        Ident(ident, is_reserved_ident(ident) && !is_path_segment_keyword(ident))
     }
 
     /// Returns `true` if the token starts with '>'.