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

Move raw_identifiers check to the lexer.

Browse source
This commit is contained in:
Lymia Aluysia 2018-03-18 11:21:38 -05:00
parent 7d5c29b9ea
commit d2e7953d13
No known key found for this signature in database
GPG key ID: DB2E204C989251F7
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/parse/lexer/mod.rs
View file

@ -1155,6 +1155,10 @@ impl<'a> StringReader<'a> {
&format!("`r#{}` is not currently supported.", ident.name)
).raise();
}
if is_raw_ident {
let span = self.mk_sp(raw_start, self.pos);
self.sess.raw_identifier_spans.borrow_mut().push(span);
}
token::Ident(ident, is_raw_ident)
}));
}

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

@ -784,7 +784,7 @@ impl<'a> Parser<'a> {
fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, ast::Ident> {
match self.token {
token::Ident(i, is_raw) => {
token::Ident(i, _) => {
if self.token.is_reserved_ident() {
let mut err = self.expected_ident_found();
if recover {
@ -793,9 +793,6 @@ impl<'a> Parser<'a> {
return Err(err);
}
}
if is_raw {
self.sess.raw_identifier_spans.borrow_mut().push(self.span);
}
self.bump();
Ok(i)
}