bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Improve $crate.

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-10-16 03:39:52 +00:00
parent 7b81106a85
commit 8b0c292a72
13 changed files with 47 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libsyntax/parse/parser.rs
View file

@ -48,8 +48,7 @@ use parse::classify;
use parse::common::SeqSep;
use parse::lexer::{Reader, TokenAndSpan};
use parse::obsolete::ObsoleteSyntax;
use parse::token::{self, intern, MatchNt, SubstNt, SpecialVarNt, InternedString};
use parse::token::{keywords, SpecialMacroVar};
use parse::token::{self, intern, keywords, MatchNt, SubstNt, InternedString};
use parse::{new_sub_parser_from_file, ParseSess};
use util::parser::{AssocOp, Fixity};
use print::pprust;
@ -2653,8 +2652,12 @@ impl<'a> Parser<'a> {
num_captures: name_num
})));
} else if self.token.is_keyword(keywords::Crate) {
let ident = match self.token {
token::Ident(id) => ast::Ident { name: token::intern("$crate"), ..id },
_ => unreachable!(),
};
self.bump();
return Ok(TokenTree::Token(sp, SpecialVarNt(SpecialMacroVar::CrateMacroVar)));
return Ok(TokenTree::Token(sp, token::Ident(ident)));
} else {
sp = mk_sp(sp.lo, self.span.hi);
self.parse_ident().unwrap_or_else(|mut e| {